diff options
| author | John Wiegley <johnw@newartisans.com> | 2007-05-03 06:11:33 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-04-13 03:38:36 -0400 |
| commit | 738287ef7059e34c2f3c894aa3b1f7da3e059975 (patch) | |
| tree | 0620fe4354be6268d6de9acd97698b12935690f0 /configure | |
| parent | c59018c29ddfc7a46aeb951fbcd5cb5b93f47ec0 (diff) | |
| download | fork-ledger-738287ef7059e34c2f3c894aa3b1f7da3e059975.tar.gz fork-ledger-738287ef7059e34c2f3c894aa3b1f7da3e059975.tar.bz2 fork-ledger-738287ef7059e34c2f3c894aa3b1f7da3e059975.zip | |
Merged ../commodity_pool
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 33 |
1 files changed, 33 insertions, 0 deletions
@@ -728,8 +728,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ledger' PACKAGE_TARNAME='ledger' +<<<<<<< HEAD:configure +PACKAGE_VERSION='3.0-git-lexical_cast' +PACKAGE_STRING='ledger 3.0-git-lexical_cast' +======= PACKAGE_VERSION='3.0-git-commodity_pool' PACKAGE_STRING='ledger 3.0-git-commodity_pool' +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure PACKAGE_BUGREPORT='johnw@newartisans.com' ac_unique_file="ledger" @@ -1424,7 +1429,11 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF +<<<<<<< HEAD:configure +\`configure' configures ledger 3.0-git-lexical_cast to adapt to many kinds of systems. +======= \`configure' configures ledger 3.0-git-commodity_pool to adapt to many kinds of systems. +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1494,7 +1503,11 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in +<<<<<<< HEAD:configure + short | recursive ) echo "Configuration of ledger 3.0-git-lexical_cast:";; +======= short | recursive ) echo "Configuration of ledger 3.0-git-commodity_pool:";; +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure esac cat <<\_ACEOF @@ -1605,7 +1618,11 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +<<<<<<< HEAD:configure +ledger configure 3.0-git-lexical_cast +======= ledger configure 3.0-git-commodity_pool +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1619,7 +1636,11 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. +<<<<<<< HEAD:configure +It was created by ledger $as_me 3.0-git-lexical_cast, which was +======= It was created by ledger $as_me 3.0-git-commodity_pool, which was +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2310,7 +2331,11 @@ fi # Define the identity of the package. PACKAGE='ledger' +<<<<<<< HEAD:configure + VERSION='3.0-git-lexical_cast' +======= VERSION='3.0-git-commodity_pool' +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure cat >>confdefs.h <<_ACEOF @@ -22045,7 +22070,11 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" +<<<<<<< HEAD:configure +This file was extended by ledger $as_me 3.0-git-lexical_cast, which was +======= This file was extended by ledger $as_me 3.0-git-commodity_pool, which was +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22098,7 +22127,11 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ +<<<<<<< HEAD:configure +ledger config.status 3.0-git-lexical_cast +======= ledger config.status 3.0-git-commodity_pool +>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |