diff -N -r -U3 libtool-old/configure.ac libtool/configure.ac --- libtool-old/configure.ac Thu Jan 1 01:00:00 1970 +++ libtool/configure.ac Wed Jun 27 09:37:33 2001 @@ -0,0 +1,93 @@ +## Process this file with autoconf to create configure. + +AC_INIT +AC_CONFIG_SRCDIR([ltmain.in]) + +AM_INIT_AUTOMAKE(libtool, 1.4a) + +# This is a sanity check so we can see which version is used in bug reports. +# It is assumed that we only want to see the date extension for cvs libtool +# versions (i.e. "odd" letters) and not actual alpha releases. +TIMESTAMP= +case "$VERSION" in + [*[acegikmoqsuwy])] + TIMESTAMP=`${CONFIG_SHELL} ${srcdir}/mkstamp < ${srcdir}/ChangeLog` + banner="Configuring $PACKAGE $VERSION$TIMESTAMP" + dashes=`echo "$banner" | sed 's/./-/g'` + + # Display an obvious version banner + echo + echo $dashes + echo "$banner" + echo $dashes + echo + ;; +esac +AC_SUBST(TIMESTAMP) + +pkgdatadir='${datadir}'"/${PACKAGE}" +AC_SUBST(pkgdatadir) # automake does not need this, but libtoolize does +aclocaldir='${datadir}/aclocal' +AC_SUBST(aclocaldir) + +# Use the specified CC and LD +AC_PROG_CC + +# Autoconf-2.13 AC_REQUIRE resolution confuses the ordering for the +# preprocessor test if left to figure this out for itself -- by forcing that +# checks here, AC_REQUIRE doesn't need to add it. When we upgrade to +# Autoconf-2.50, this can be removed. +AC_PROG_CPP + +AM_PROG_LD +AC_SUBST(LD) +AM_PROG_NM +AC_SUBST(NM) +AC_PROG_LN_S + +pushdef([AC_MSG_ERROR], [CXX=no]) +AC_PROG_CXX +popdef([AC_MSG_ERROR]) +AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno]) + +LT_AC_PROG_GCJ +AM_CONDITIONAL(HAVE_GCJ, [test "x$GCJ" != xno]) + +# Declare win32 dll support +AC_LIBTOOL_WIN32_DLL + +# Autoconf-2.13 AC_REQUIRE resolution confuses the ordering for the cygwin +# and mingw tests if left to figure this out for itself -- by forcing those +# checks here, AC_REQUIRE doesn't need to add them. When we upgrade to +# Autoconf-2.50, this can be removed. +AC_EXEEXT +AC_OBJEXT + +# Check for dlopen support +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(ltdl-install, +[ --disable-ltdl-install do not install libltdl]) +if test x"${enable_ltdl_install+set}" != xset; then + enable_ltdl_install=yes + ac_configure_args="$ac_configure_args --enable-ltdl-install" +fi +AC_CONFIG_SUBDIRS(libltdl) + +# all subdirectories that are configured on demand, but that must be +# included in the distribution +CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo tagdemo" +AC_SUBST(CONF_SUBDIRS) + +ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4" +DIST_MAKEFILE_LIST= +for dir in $CONF_SUBDIRS; do + ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST ${srcdir}/$dir/acinclude.m4" + DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile " +done +AC_SUBST(ACINCLUDE_M4_LIST) +AC_SUBST(DIST_MAKEFILE_LIST) + +AC_CONFIG_FILES([Makefile doc/Makefile tests/Makefile]) +AC_OUTPUT diff -N -r -U3 libtool-old/configure.in libtool/configure.in --- libtool-old/configure.in Sun Jun 24 21:13:42 2001 +++ libtool/configure.in Thu Jan 1 01:00:00 1970 @@ -1,91 +0,0 @@ -## Process this file with autoconf to create configure. - -AC_INIT(ltmain.in) - -AM_INIT_AUTOMAKE(libtool, 1.4a) - -# This is a sanity check so we can see which version is used in bug reports. -# It is assumed that we only want to see the date extension for cvs libtool -# versions (i.e. "odd" letters) and not actual alpha releases. -TIMESTAMP= -case "$VERSION" in - [*[acegikmoqsuwy])] - TIMESTAMP=`${CONFIG_SHELL} ${srcdir}/mkstamp < ${srcdir}/ChangeLog` - banner="Configuring $PACKAGE $VERSION$TIMESTAMP" - dashes=`echo "$banner" | sed 's/./-/g'` - - # Display an obvious version banner - echo - echo $dashes - echo "$banner" - echo $dashes - echo - ;; -esac -AC_SUBST(TIMESTAMP) - -pkgdatadir='${datadir}'"/${PACKAGE}" -AC_SUBST(pkgdatadir) # automake does not need this, but libtoolize does -aclocaldir='${datadir}/aclocal' -AC_SUBST(aclocaldir) - -# Use the specified CC and LD -AC_PROG_CC - -# Autoconf-2.13 AC_REQUIRE resolution confuses the ordering for the -# preprocessor test if left to figure this out for itself -- by forcing that -# checks here, AC_REQUIRE doesn't need to add it. When we upgrade to -# Autoconf-2.50, this can be removed. -AC_PROG_CPP - -AM_PROG_LD -AC_SUBST(LD) -AM_PROG_NM -AC_SUBST(NM) -AC_PROG_LN_S - -pushdef([AC_MSG_ERROR], [CXX=no]) -AC_PROG_CXX -popdef([AC_MSG_ERROR]) -AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno]) - -LT_AC_PROG_GCJ -AM_CONDITIONAL(HAVE_GCJ, [test "x$GCJ" != xno]) - -# Declare win32 dll support -AC_LIBTOOL_WIN32_DLL - -# Autoconf-2.13 AC_REQUIRE resolution confuses the ordering for the cygwin -# and mingw tests if left to figure this out for itself -- by forcing those -# checks here, AC_REQUIRE doesn't need to add them. When we upgrade to -# Autoconf-2.50, this can be removed. -AC_EXEEXT -AC_OBJEXT - -# Check for dlopen support -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -AC_ARG_ENABLE(ltdl-install, -[ --disable-ltdl-install do not install libltdl]) -if test x"${enable_ltdl_install+set}" != xset; then - enable_ltdl_install=yes - ac_configure_args="$ac_configure_args --enable-ltdl-install" -fi -AC_CONFIG_SUBDIRS(libltdl) - -# all subdirectories that are configured on demand, but that must be -# included in the distribution -CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo tagdemo" -AC_SUBST(CONF_SUBDIRS) - -ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4" -DIST_MAKEFILE_LIST= -for dir in $CONF_SUBDIRS; do - ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST ${srcdir}/$dir/acinclude.m4" - DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile " -done -AC_SUBST(ACINCLUDE_M4_LIST) -AC_SUBST(DIST_MAKEFILE_LIST) - -AC_OUTPUT([Makefile doc/Makefile tests/Makefile]) diff -N -r -U3 libtool-old/libltdl/acconfig.h libtool/libltdl/acconfig.h --- libtool-old/libltdl/acconfig.h Thu Apr 29 10:09:19 1999 +++ libtool/libltdl/acconfig.h Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -/* Some of these are defined here, not in configure.in, because - they're AC_DEFINEd in two different places, which causes two - defines to appear. Some C compilers might now appreciate it... */ - -/* Define if you have the libdl library or equivalent. */ -#undef HAVE_LIBDL - -/* Define if you have the GNU dld library. */ -#undef HAVE_DLD - -/* Define if you have the shl_load function. */ -#undef HAVE_SHL_LOAD diff -N -r -U3 libtool-old/libltdl/configure.ac libtool/libltdl/configure.ac --- libtool-old/libltdl/configure.ac Thu Jan 1 01:00:00 1970 +++ libtool/libltdl/configure.ac Wed Jun 27 09:34:13 2001 @@ -0,0 +1,44 @@ +dnl Process this file with autoconf to create configure. + +AC_INIT(ltdl.c) + +dnl We shouldn't be using these internal macros of autoconf, +dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake. +AC_ARG_WITH(auxdir, +[ --with-auxdir=DIR path to autoconf auxiliary files], +[AC_CONFIG_AUX_DIRS($with_auxdir)], +[AC_CONFIG_AUX_DIR_DEFAULT]) + +if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then + if test -f ${srcdir}/ltmain.sh; then + # if libltdl is libtoolized, it is assumed to be stand-alone and + # installed unless the command line overrides it (tested above) + enable_ltdl_install=yes + else + AC_MSG_WARN([*** The top-level configure must select either]) + AC_MSG_WARN([*** [A""C_LIBLTDL_INSTALLABLE] or [A""C_LIBLTDL_CONVENIENCE].]) + AC_MSG_ERROR([*** Maybe you want to --enable-ltdl-install?]) + fi +fi + +AM_INIT_AUTOMAKE(libltdl,1.1,-) +AM_CONFIG_HEADER(config.h) +AM_MAINTAINER_MODE + +AC_PROG_CC +AC_C_CONST +AC_C_INLINE + +AC_LIBTOOL_WIN32_DLL +AM_PROG_LIBTOOL +AC_SUBST(LIBTOOL_DEPS) + +AC_LIB_LTDL + +dnl Output the makefile +AC_OUTPUT(Makefile) + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: diff -N -r -U3 libtool-old/libltdl/configure.in libtool/libltdl/configure.in --- libtool-old/libltdl/configure.in Wed Apr 25 01:22:35 2001 +++ libtool/libltdl/configure.in Thu Jan 1 01:00:00 1970 @@ -1,44 +0,0 @@ -dnl Process this file with autoconf to create configure. - -AC_INIT(ltdl.c) - -dnl We shouldn't be using these internal macros of autoconf, -dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake. -AC_ARG_WITH(auxdir, -[ --with-auxdir=DIR path to autoconf auxiliary files], -[AC_CONFIG_AUX_DIRS($with_auxdir)], -[AC_CONFIG_AUX_DIR_DEFAULT]) - -if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then - if test -f ${srcdir}/ltmain.sh; then - # if libltdl is libtoolized, it is assumed to be stand-alone and - # installed unless the command line overrides it (tested above) - enable_ltdl_install=yes - else - AC_MSG_WARN([*** The top-level configure must select either]) - AC_MSG_WARN([*** [A""C_LIBLTDL_INSTALLABLE] or [A""C_LIBLTDL_CONVENIENCE].]) - AC_MSG_ERROR([*** Maybe you want to --enable-ltdl-install?]) - fi -fi - -AM_INIT_AUTOMAKE(libltdl,1.1,-) -AM_CONFIG_HEADER(config.h) -AM_MAINTAINER_MODE - -AC_PROG_CC -AC_C_CONST -AC_C_INLINE - -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) - -AC_LIB_LTDL - -dnl Output the makefile -AC_OUTPUT(Makefile) - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff -N -r -U3 libtool-old/libtool.m4 libtool/libtool.m4 --- libtool-old/libtool.m4 Mon Jun 25 22:42:45 2001 +++ libtool/libtool.m4 Wed Jun 27 11:04:40 2001 @@ -420,10 +420,9 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C + [AC_LANG_PUSH(C) AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) + AC_LANG_POP]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -482,7 +481,7 @@ # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. - cat conftest.err 1>&AC_FD_CC + cat conftest.err 1>&AS_MESSAGE_LOG_FD() else $2=yes fi @@ -514,7 +513,7 @@ # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. - cat conftest.err 1>&AC_FD_CC + cat conftest.err 1>&AS_MESSAGE_LOG_FD() else $2=yes fi @@ -798,7 +797,7 @@ # So say no if there are warnings if test -s out/conftest.err; then # Append any errors to the config.log. - cat out/conftest.err 1>&AC_FD_CC + cat out/conftest.err 1>&AS_MESSAGE_LOG_FD() else _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi @@ -833,7 +832,7 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) if test "$hard_links" = no; then - AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe]) + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) need_locks=warn fi else @@ -1326,15 +1325,15 @@ if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then - AC_MSG_WARN([output file \`$ofile' does not exist]) + AC_MSG_WARN([output file `$ofile' does not exist]) fi if test -z "$LTCC"; then eval "`$SHELL ${ofile} --config | grep '^LTCC='`" if test -z "$LTCC"; then - AC_MSG_WARN([output file \`$ofile' does not look like a libtool script]) + AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) else - AC_MSG_WARN([using \`LTCC=$LTCC', extracted from \`$ofile']) + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi @@ -1624,7 +1623,6 @@ # find a file program which can recognise a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl -AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin${PATH_SEPARATOR-:}$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -2091,8 +2089,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) AC_DEFUN([_LT_AC_LANG_C_CONFIG], [lt_save_CC="$CC" -AC_LANG_SAVE -AC_LANG_C +AC_LANG_PUSH(C) # Source file extension for C test sources. ac_ext=c @@ -2121,10 +2118,10 @@ esac fi if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then - AC_MSG_WARN([\`$CC' requires \`$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) + AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]"] >/dev/null; then : else - AC_MSG_WARN([add \`$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) + AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no fi fi @@ -2160,7 +2157,7 @@ AC_LIBTOOL_CONFIG($1) -AC_LANG_RESTORE +AC_LANG_POP CC="$lt_save_CC" ])# AC_LIBTOOL_LANG_C_CONFIG @@ -2172,8 +2169,7 @@ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_SAVE -AC_LANG_CPLUSPLUS +[AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXXCPP]) @@ -2942,7 +2938,7 @@ AC_LIBTOOL_CONFIG($1) -AC_LANG_RESTORE +AC_LANG_POP CC="$lt_save_CC" ])# AC_LIBTOOL_LANG_CXX_CONFIG @@ -3086,7 +3082,7 @@ [cfgfile="${ofile}T" trap "$rm \"$cfgfile\"; exit 1" 1 2 15 $rm -f "$cfgfile" - echo creating $ofile], + AC_MSG_NOTICE([creating $ofile])], [cfgfile="$ofile"]) cat <<__EOF__ >> "$cfgfile" @@ -3615,16 +3611,16 @@ LIBS="$lt_save_LIBS" CFLAGS="$lt_save_CFLAGS" else - echo "cannot find nm_test_func in $nlist" >&AC_FD_CC + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD() fi else - echo "cannot find nm_test_var in $nlist" >&AC_FD_CC + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD() fi else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD() fi else - echo "$progname: failed program was:" >&AC_FD_CC + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD() cat conftest.$ac_ext >&5 fi rm -f conftest* conftst*