sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /Users/johnw/src/ledger/master/

Browse source
This commit is contained in:
John Wiegley 2007-05-04 05:27:17 +00:00
parent 738287ef70
commit 6489868434
1 changed files with 10 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for ledger 3.0-git-commodity_pool. # Generated by GNU Autoconf 2.61 for ledger 3.0-git-optimal_optional.
# #
# Report bugs to <johnw@newartisans.com>. # Report bugs to <johnw@newartisans.com>.
# #
@ -728,13 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='ledger' PACKAGE_NAME='ledger'
PACKAGE_TARNAME='ledger' PACKAGE_TARNAME='ledger'
<<<<<<< HEAD:configure PACKAGE_VERSION='3.0-git-optimal_optional'
PACKAGE_VERSION='3.0-git-lexical_cast' PACKAGE_STRING='ledger 3.0-git-optimal_optional'
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' PACKAGE_BUGREPORT='johnw@newartisans.com'
ac_unique_file="ledger" ac_unique_file="ledger"
@ -1429,11 +1424,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
<<<<<<< HEAD:configure \`configure' configures ledger 3.0-git-optimal_optional to adapt to many kinds of systems.
\`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]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1503,11 +1494,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
<<<<<<< HEAD:configure short | recursive ) echo "Configuration of ledger 3.0-git-optimal_optional:";;
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 esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1618,11 +1605,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
<<<<<<< HEAD:configure ledger configure 3.0-git-optimal_optional
ledger configure 3.0-git-lexical_cast
=======
ledger configure 3.0-git-commodity_pool
>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure
generated by GNU Autoconf 2.61 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1636,11 +1619,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
<<<<<<< HEAD:configure It was created by ledger $as_me 3.0-git-optimal_optional, which was
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 generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
@ -2331,11 +2310,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='ledger' PACKAGE='ledger'
<<<<<<< HEAD:configure VERSION='3.0-git-optimal_optional'
VERSION='3.0-git-lexical_cast'
=======
VERSION='3.0-git-commodity_pool'
>>>>>>> 084f9d776dfed8da92b05f6daf52e8c2c8370f21:configure
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -22070,11 +22045,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
<<<<<<< HEAD:configure This file was extended by ledger $as_me 3.0-git-optimal_optional, which was
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 generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -22127,11 +22098,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
<<<<<<< HEAD:configure ledger config.status 3.0-git-optimal_optional
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, configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"