From 04a3b39359550f960849d4d6aa4d1709f35df29a Mon Sep 17 00:00:00 2001 From: ivmai Date: Wed, 30 Sep 2009 19:05:39 +0000 Subject: [PATCH] 2009-09-30 Ivan Maidanski * configure: Regenerate (by autoreconf -vif, deleting libtool.m4 first). * Makefile.in: Ditto. * aclocal.m4: Ditto. * include/private/config.h.in: Ditto. --- ChangeLog | 8 +++ Makefile.in | 3 +- aclocal.m4 | 1 + configure | 105 +++++++++++++++++++++++++----------- include/private/config.h.in | 9 ++++ 5 files changed, 95 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7bbfad2..7dc4f53e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-09-30 Ivan Maidanski + + * configure: Regenerate (by autoreconf -vif, deleting libtool.m4 + first). + * Makefile.in: Ditto. + * aclocal.m4: Ditto. + * include/private/config.h.in: Ditto. + 2009-09-30 Ivan Maidanski * Makefile.direct: Remove trailing spaces at EOLn. diff --git a/Makefile.in b/Makefile.in index a8174838..9f77f32c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,7 +130,8 @@ DIST_COMMON = $(am__configure_deps) $(am__pkginclude_HEADERS_DIST) \ @CPLUSPLUS_TRUE@am__append_12 = test_cpp subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/aclocal.m4 b/aclocal.m4 index 731b5744..35b5cecc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -7337,3 +7337,4 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([acinclude.m4]) diff --git a/configure b/configure index 9c8bad60..a4ae55ee 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.50 . +# From configure.ac Revision: 1.51 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for gc 7.2alpha3. # @@ -1655,7 +1655,52 @@ test -n "$target_alias" && program_prefix=${target_alias}- -GC_SET_VERSION + + echo "$as_me:$LINENO: checking GC version numbers" >&5 +echo $ECHO_N "checking GC version numbers... $ECHO_C" >&6 + GC_VERSION_MAJOR=`echo $PACKAGE_VERSION | sed 's/^\([0-9][0-9]*\)[.].*$/\1/g'` + GC_VERSION_MINOR=`echo $PACKAGE_VERSION | sed 's/^[^.]*[.]\([0-9][0-9]*\).*$/\1/g'` + GC_ALPHA_VERSION=`echo $PACKAGE_VERSION | sed 's/^[^.]*[.][0-9]*//'` + + case "$GC_ALPHA_VERSION" in + alpha*) + GC_ALPHA_VERSION=`echo $GC_ALPHA_VERSION \ + | sed 's/alpha\([0-9][0-9]*\)/\1/'` ;; + *) GC_ALPHA_MAJOR='' ;; + esac + + if test :$GC_VERSION_MAJOR: = :: \ + -o :$GC_VERSION_MINOR: = :: ; + then + echo "$as_me:$LINENO: result: invalid" >&5 +echo "${ECHO_T}invalid" >&6 + { { echo "$as_me:$LINENO: error: nonconforming PACKAGE_VERSION='$PACKAGE_VERSION'" >&5 +echo "$as_me: error: nonconforming PACKAGE_VERSION='$PACKAGE_VERSION'" >&2;} + { (exit 1); exit 1; }; } + fi + + +cat >>confdefs.h <<_ACEOF +#define GC_VERSION_MAJOR $GC_VERSION_MAJOR +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define GC_VERSION_MINOR $GC_VERSION_MINOR +_ACEOF + + if test :$GC_ALPHA_VERSION: != :: ; then + +cat >>confdefs.h <<_ACEOF +#define GC_ALPHA_VERSION $GC_ALPHA_VERSION +_ACEOF + + fi + echo "$as_me:$LINENO: result: major=$GC_VERSION_MAJOR minor=$GC_VERSION_MINOR \ +${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION" >&5 +echo "${ECHO_T}major=$GC_VERSION_MAJOR minor=$GC_VERSION_MINOR \ +${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION" >&6 + am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -6242,7 +6287,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6245 "configure"' > conftest.$ac_ext + echo '#line 6290 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7377,7 +7422,7 @@ fi # Provide some information about the compiler. -echo "$as_me:7380:" \ +echo "$as_me:7425:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8440,11 +8485,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8443: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8488: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8447: \$? = $ac_status" >&5 + echo "$as_me:8492: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8708,11 +8753,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8756: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8715: \$? = $ac_status" >&5 + echo "$as_me:8760: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8812,11 +8857,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8815: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8860: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8819: \$? = $ac_status" >&5 + echo "$as_me:8864: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10281,7 +10326,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 10284 "configure"' > conftest.$ac_ext + echo '#line 10329 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11178,7 +11223,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13669: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13628: \$? = $ac_status" >&5 + echo "$as_me:13673: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13725,11 +13770,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13728: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13773: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13732: \$? = $ac_status" >&5 + echo "$as_me:13777: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14261,7 +14306,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14264 "configure"' > conftest.$ac_ext + echo '#line 14309 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15319,11 +15364,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15322: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15367: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15326: \$? = $ac_status" >&5 + echo "$as_me:15371: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15423,11 +15468,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15426: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15471: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15430: \$? = $ac_status" >&5 + echo "$as_me:15475: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16872,7 +16917,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 16875 "configure"' > conftest.$ac_ext + echo '#line 16920 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17650,11 +17695,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17653: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17698: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17657: \$? = $ac_status" >&5 + echo "$as_me:17702: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17918,11 +17963,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17921: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17966: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17925: \$? = $ac_status" >&5 + echo "$as_me:17970: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18022,11 +18067,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18025: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18070: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18029: \$? = $ac_status" >&5 + echo "$as_me:18074: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19491,7 +19536,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 19494 "configure"' > conftest.$ac_ext + echo '#line 19539 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? diff --git a/include/private/config.h.in b/include/private/config.h.in index eff57043..44bc3252 100644 --- a/include/private/config.h.in +++ b/include/private/config.h.in @@ -24,6 +24,9 @@ /* Define to support IBM AIX threads. */ #undef GC_AIX_THREADS +/* The alpha version number, if applicable. */ +#undef GC_ALPHA_VERSION + /* Define to enable internal debug assertions. */ #undef GC_ASSERTIONS @@ -69,6 +72,12 @@ /* See Makefile.direct. */ #undef GC_USE_DLOPEN_WRAP +/* The major version number of this GC release. */ +#undef GC_VERSION_MAJOR + +/* The minor version number of this GC release. */ +#undef GC_VERSION_MINOR + /* Define to support win32 threads. */ #undef GC_WIN32_THREADS -- 2.40.0