Index: libtool/.cvsignore diff -c libtool/.cvsignore:1.2 libtool/.cvsignore:1.2.6.1 *** libtool/.cvsignore:1.2 Sun Mar 14 00:42:46 1999 --- libtool/.cvsignore Mon Sep 10 18:25:54 2001 *************** *** 8,12 **** config.* libtool ltmain.sh - ltconfig libtoolize --- 8,11 ---- Index: libtool/ChangeLog diff -c libtool/ChangeLog:1.922.2.35 libtool/ChangeLog:1.922.2.54 *** libtool/ChangeLog:1.922.2.35 Sun Sep 2 21:48:29 2001 --- libtool/ChangeLog Mon Sep 10 23:33:37 2001 *************** *** 1,5 **** --- 1,119 ---- + 2001-09-11 Gary V. Vaughan + + GNU libtool 1.4.2 was released. + + * configure.in: Bumped version to 1.4.2. + * config.sub, config.guess: Synchronised from ftp.gnu.org. + * NEWS: Updated. + + 2001-09-11 Gary V. Vaughan , Albert Chin . Tim Van Holder + + * libtool.m4 (no_undefine_flag) [solaris*]: Don't set this flag + if GCC < 3.0 with native ld, which introduces a dependency on + libgcc.a under certain circumstances, which in turn violates + -no-undefined. Also display a prominent configure time warning if + the buggy combination of GCC and ld is detected. + (AC_LIBTOOL_HEADER_ASSERT): libltdl falls foul of this bug + because assert requires __eprintf from libgcc.a. This macro + detects the combination of GCC and ld that produce this problem, + and pretends that assert.h does not exist... + * libltdl/ltdl.c (HAVE_ASSERT_H): ...so that assertions can be + disabled in libltdl. Otherwise the library would only be useable + when linking using gcc, or by manually adding libgcc.a to the link + line of the application that uses libltdl. + * ltdl.m4 (AC_LIB_LTDL): Require AC_LIBTOOL_HEADER_ASSERT. + * doc/PLATFORMS: Updated. + + 2001-09-11 Daniel Harvey + + * libtool.m4 (ltdll_cmds): [$]0 doesn't appear to translate through + the script correctly, change to $''0 + + 2001-09-11 Gary V. Vaughan + + * libltdl/configure.in (AC_CONFIG_HEADER): Use config-h.in for DOS + compatibility. + + * libtool.m4: Add missing M4 quotation to $1 of AC_DEFUN calls. + + * libltdl/configure.in (AM_INIT_AUTOMAKE): Bump libltdl version to + 1.2. + * libltdl/Makefile.am (libltdl_la_LDFLAGS): Bump libtool library + version info to 4:0:1. + + 2001-09-10 Gary V. Vaughan + + * libtool.m4 (_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR): Oops. We + really ought to set PATH_SEPARATOR in here somewhere. + (AC_PROG_LD): Don't forget to AC_REQUIRE it! Be careful not to + set IFS="${IFS}$PATH_SEPARATOR" for PATH splitting, otherwise + spaces in directory names will be lost. + (AC_PROG_NM): Dittp. + * ltmain.in: Default IFS once, at the start. + Reported by Akim Demaille + + 2001-09-10 Brad + + * ltmain.in (-lc_r): Style improvement. + + * doc/libtool.texi: Remove obsolete references to ltconfig. + * bootstrap: Don't bother creating an empty ltconfig and then + removing it. + * tests/quote.test: s/ltconfig/\$0/ + + 2001-09-09 Gary V. Vaughan + + From Brad : + * libtool.m4: Use Autoconf square bracket quoting style + consistently throughout. + + 2001-09-07 Gary V. Vaughan + + * bootstrap: Cleanup `autom4te' and `libtool' so that we don't + get caught by something from a previous build. + + * libtool.m4 (archive_cmds, archive_expsym_cmds) [solaris*]: Revert + my 2001-09-06 patch. + (no_undefined_flag)i [solaris*]: Revert Alexandre's 2001-04-11 patch. + + * libltdl/acconfig.h: Removed. Obsoleted with modern Automake + (i.e. 1.4 or better). + + * libltdl/ltdl.c (foreach_dirinpath): argz_len should be a size_t. + Reported by Albert Chin + + 2001-09-06 Gary V. Vaughan + + * libtool.m4 (archive_cmds, archive_expsym_cmds) [solaris*]: Changing + no_undefined_flag from `-z text' to `-z defs' (see entry below at + 2001-04-11 Alexandre Oliva ) has a problem. + when linking a shared library with gcc calling /usr/ccs/bin/ld (eg. + the gcc supplied with Solaris 8 companion CD), using the flag + -no-undefined, shared library linking will always fail because of + the unresolved symbols from libgcc.a. Consequently we have to + provide a path to libgcc.a when linking shared libraries in + conjunction with -no-undefined! + + From Michael Pruett : + * libltdl/ltdl.c (find_module): `0' valued arguments to + tryall_dlopen_module() must be explicitly cast to avoid compiler + warnings on some environments. + + 2001-09-03 Gary V. Vaughan + + * demo/Makefile.am (helldl): Automake 1.4 can't find the target + if we use helldl$(EXEEXT), and Automake 1.5 barfs unless we do. + Using both targets to the left of the colon seems to work though! + + 2001-09-03 Brad + + * ltdl.m4 [AC_LTDL_SYS_DLOPEN_DEPLIBS]: Teach ltdl about the + behavior of OpenBSD's dlopen(). + 2001-09-03 Gary V. Vaughan + * configure.in: Bumped version to 1.4.1a. + GNU libtool 1.4.1 was released. * configure.in: Bumped version to 1.4.1. *************** *** 3728,3731 **** Continued in ChangeLog.0 ! $Revision: 1.922.2.35 $ $Date: 2001/09/03 01:48:29 $ --- 3842,3845 ---- Continued in ChangeLog.0 ! $Revision: 1.922.2.54 $ $Date: 2001/09/11 03:33:37 $ Index: libtool/NEWS diff -c libtool/NEWS:1.91.2.6 libtool/NEWS:1.91.2.7 *** libtool/NEWS:1.91.2.6 Sun Sep 2 21:48:29 2001 --- libtool/NEWS Mon Sep 10 23:33:37 2001 *************** *** 1,5 **** --- 1,13 ---- NEWS - list of user-visible changes between releases of GNU Libtool + New in 1.4.2: 2001-09-11; CVS version 1.4.1a, Gary V. Vaughan: + * libltdl now builds on solaris again + * diagnose and warn about not-quite-working combinations of gcc and + * ld on solaris + * Improved OpenBSD support. + * Improved cygwin support. + * Bugfixes. + New in 1.4.1: 2001-09-03; CVS version 1.4.0a, Libtool team: * Better error messages from libltdl when loading fails. * Don't leave here-doc files behind. Index: libtool/bootstrap diff -c libtool/bootstrap:1.16 libtool/bootstrap:1.16.2.3 *** libtool/bootstrap:1.16 Sun Apr 22 19:28:01 2001 --- libtool/bootstrap Mon Sep 10 18:25:55 2001 *************** *** 3,8 **** --- 3,10 ---- # helps bootstrapping libtool, when checked out from CVS # requires GNU autoconf and GNU automake + find . \( -name autom4te.cache -o -name libtool \) -print | xargs rm -r + file=Makefile.in : ${ACLOCAL=aclocal} *************** *** 14,20 **** ln -s libtool.m4 acinclude.m4 # fake the libtool scripts touch ltmain.sh - touch ltconfig touch libtoolize $ACLOCAL $AUTOMAKE --gnu --add-missing --copy --- 16,21 ---- *************** *** 32,37 **** cd .. done ! rm -f ltmain.sh ltconfig libtoolize Makefile exit 0 --- 33,38 ---- cd .. done ! rm -f ltmain.sh libtoolize Makefile exit 0 Index: libtool/config.guess diff -c libtool/config.guess:1.9.2.1 libtool/config.guess:1.9.2.2 *** libtool/config.guess:1.9.2.1 Sun Sep 2 21:48:29 2001 --- libtool/config.guess Mon Sep 10 23:33:37 2001 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-08-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 393,398 **** --- 393,399 ---- echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ *************** *** 414,420 **** exit (-1); } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy \ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ && rm -f $dummy.c $dummy && exit 0 --- 415,420 ---- *************** *** 484,489 **** --- 484,490 ---- exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include *************** *** 495,501 **** exit(0); } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 --- 496,501 ---- *************** *** 563,568 **** --- 563,569 ---- fi ;; esac if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE *************** *** 596,605 **** exit (0); } EOF ! eval $set_cc_for_build ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} --- 597,605 ---- exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} *************** *** 609,614 **** --- 609,615 ---- echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int *************** *** 634,640 **** exit (0); } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 --- 635,640 ---- *************** *** 851,856 **** --- 851,857 ---- exit 0 ;; esac # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build cat >$dummy.c < #ifdef __cplusplus *************** *** 875,881 **** return 0; } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 --- 876,881 ---- *************** *** 1122,1127 **** --- 1122,1128 ---- #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + eval $set_cc_for_build cat >$dummy.c < *************** *** 1236,1242 **** } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy --- 1237,1242 ---- Index: libtool/config.sub diff -c libtool/config.sub:1.8.2.1 libtool/config.sub:1.8.2.2 *** libtool/config.sub:1.8.2.1 Sun Sep 2 21:48:29 2001 --- libtool/config.sub Mon Sep 10 23:33:37 2001 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-08-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-09-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 236,242 **** | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el | mips64vr4300 \ | mips64vr4300el | mips64vr5000 | mips64vr5000el \ ! | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | ns16k | ns32k \ | openrisc \ --- 236,243 ---- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el | mips64vr4300 \ | mips64vr4300el | mips64vr5000 | mips64vr5000el \ ! | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ ! | mipsisa32 \ | mn10200 | mn10300 \ | ns16k | ns32k \ | openrisc \ *************** *** 293,300 **** | m88110-* | m88k-* | mcore-* \ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \ ! | mipsle-* | mipstx39-* | mipstx39el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ --- 294,301 ---- | m88110-* | m88k-* | mcore-* \ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ ! | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ Index: libtool/configure.in diff -c libtool/configure.in:1.52.2.2 libtool/configure.in:1.52.2.4 *** libtool/configure.in:1.52.2.2 Sun Sep 2 21:48:29 2001 --- libtool/configure.in Mon Sep 10 23:33:37 2001 *************** *** 2,8 **** AC_INIT(ltmain.in) ! AM_INIT_AUTOMAKE(libtool, 1.4.1) # 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 --- 2,8 ---- AC_INIT(ltmain.in) ! AM_INIT_AUTOMAKE(libtool, 1.4.2) # 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 *************** *** 21,27 **** echo $dashes echo ;; ! esac AC_SUBST(TIMESTAMP) pkgdatadir='${datadir}'"/${PACKAGE}" --- 21,27 ---- echo $dashes echo ;; ! esac AC_SUBST(TIMESTAMP) pkgdatadir='${datadir}'"/${PACKAGE}" Index: libtool/libtool.m4 diff -c libtool/libtool.m4:1.166.2.20 libtool/libtool.m4:1.166.2.27 *** libtool/libtool.m4:1.166.2.20 Sun Sep 2 19:31:08 2001 --- libtool/libtool.m4 Mon Sep 10 23:18:52 2001 *************** *** 24,31 **** # serial 46 AC_PROG_LIBTOOL - builtin([undefine],[symbols]) - AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl --- 24,29 ---- *************** *** 151,159 **** ]) # _LT_AC_CHECK_DLFCN # -------------------- ! AC_DEFUN(_LT_AC_CHECK_DLFCN, [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN --- 149,178 ---- ]) + # AC_LIBTOOL_HEADER_ASSERT + # ------------------------ + AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], + [AC_CACHE_CHECK([whether $CC supports assert without backlinking], + [lt_cv_func_assert_works], + [case $host in + *-*-solaris*) + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) lt_cv_func_assert_works=no ;; + *) lt_cv_func_assert_works=yes ;; + esac + fi + ;; + esac]) + + if test "x$lt_cv_func_assert_works" = xyes; then + AC_CHECK_HEADERS(assert.h) + fi + ])# AC_LIBTOOL_HEADER_ASSERT + # _LT_AC_CHECK_DLFCN # -------------------- ! AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN *************** *** 171,180 **** # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. ! [symcode='[BCDEGRST]'] # Regexp to match symbols that can be accessed directly from C. ! [sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' --- 190,199 ---- # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. ! symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. ! sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' *************** *** 188,210 **** # Define system-specific variables. case $host_os in aix*) ! [symcode='[BCDT]'] ;; cygwin* | mingw* | pw32*) ! [symcode='[ABCDGISTW]'] ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; irix*) ! [symcode='[BCDEGRST]'] ;; solaris* | sysv5*) ! [symcode='[BDT]'] ;; sysv4) ! [symcode='[DFNSTU]'] ;; esac --- 207,229 ---- # Define system-specific variables. case $host_os in aix*) ! symcode='[[BCDT]]' ;; cygwin* | mingw* | pw32*) ! symcode='[[ABCDGISTW]]' ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; irix*) ! symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) ! symcode='[[BDT]]' ;; sysv4) ! symcode='[[DFNSTU]]' ;; esac *************** *** 218,231 **** # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then ! [symcode='[ABCDGISTW]'] fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. ! [lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"] # Check to see that the pipe works correctly. pipe_works=no --- 237,250 ---- # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then ! symcode='[[ABCDGISTW]]' fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. ! lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no *************** *** 278,284 **** const char *name; lt_ptr address; } ! [lt_preloaded_symbols[] =] { EOF sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext --- 297,303 ---- const char *name; lt_ptr address; } ! lt_preloaded_symbols[[]] = { EOF sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext *************** *** 351,363 **** *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which ! # will find an echo command which doesn;t interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [AC_DIVERT_PUSH(NOTICE)]) --- 370,383 ---- *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which ! # will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [AC_DIVERT_PUSH(NOTICE)]) *************** *** 426,432 **** # # So, first we look for a working echo in the user's PATH. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && --- 446,452 ---- # # So, first we look for a working echo in the user's PATH. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && *************** *** 515,521 **** # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ ! AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, [if test "$cross_compiling" = yes; then : [$4] else --- 535,541 ---- # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ ! AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else *************** *** 602,608 **** # AC_LIBTOOL_DLOPEN_SELF # ------------------- ! AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown --- 622,628 ---- # AC_LIBTOOL_DLOPEN_SELF # ------------------- ! AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown *************** *** 702,711 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' ! [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. ! [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. --- 722,731 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' ! sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' # Same as above, but do not quote variable references. ! double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. *************** *** 1004,1010 **** # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) ! if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no --- 1024,1030 ---- # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) ! if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no *************** *** 1303,1309 **** # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ! ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= --- 1323,1329 ---- # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ! ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= *************** *** 1316,1322 **** # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ ! [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. --- 1336,1342 ---- # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ ! sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. *************** *** 1709,1715 **** --- 1729,1763 ---- ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) + cat <&2 + + *** Warning: Releases of GCC earlier than version 3.0 cannot reliably + *** create self contained shared libraries on Solaris systems, without + *** introducing a dependency on libgcc.a. Therefore, libtool is disabling + *** -no-undefined support, which will at least allow you to build shared + *** libraries. However, you may find that when you link such libraries + *** into an application without using GCC, you have to manually add + *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to + *** upgrade to a newer version of GCC. Another option is to rebuild your + *** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + + EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' *************** *** 1718,1724 **** hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in ! [solaris2.[0-5] | solaris2.[0-5].*]) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac --- 1766,1772 ---- hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in ! solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac *************** *** 1910,1924 **** # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in ! [ aix4 | aix4.[01] | aix4.[01].*)] ! if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ! echo ' yes ' ! echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ! : ! else ! can_build_shared=no ! fi ! ;; esac # AIX (on Power*) has no versioning support, so currently we can # not hardcode correct soname into executable. Probably we can --- 1958,1972 ---- # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in ! aix4 | aix4.[[01]] | aix4.[[01]].*) ! if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ! echo ' yes ' ! echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ! : ! else ! can_build_shared=no ! fi ! ;; esac # AIX (on Power*) has no versioning support, so currently we can # not hardcode correct soname into executable. Probably we can *************** *** 1942,1948 **** amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. ! finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) --- 1990,1996 ---- amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. ! finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) *************** *** 1973,1979 **** case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' ! soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ --- 2021,2027 ---- case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' ! soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ *************** *** 1983,1996 **** $rm \$dlpath' ;; yes,mingw*) ! library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) ! library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' --- 2031,2044 ---- $rm \$dlpath' ;; yes,mingw*) ! library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) ! library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' *************** *** 3133,3138 **** --- 3181,3187 ---- AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl + AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. *************** *** 3146,3153 **** esac case $ac_prog in # Accept absolute paths. ! [[\\/]* | [A-Za-z]:[\\/]*)] ! [re_direlt='/[^/][^/]*/\.\./'] # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do --- 3195,3202 ---- esac case $ac_prog in # Accept absolute paths. ! [[\\/]]* | [[A-Za-z]]:[[\\/]]*) ! re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do *************** *** 3171,3177 **** fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then --- 3220,3226 ---- fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then *************** *** 3235,3241 **** # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. ! # ['file_magic [regex]'] -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. --- 3284,3290 ---- # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. ! # 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. *************** *** 3250,3256 **** ;; bsdi4*) ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; --- 3299,3305 ---- ;; bsdi4*) ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; *************** *** 3279,3285 **** i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. ! [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; --- 3328,3334 ---- i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. ! lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; *************** *** 3294,3300 **** ;; hpux10.20*|hpux11*) ! [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; --- 3343,3349 ---- ;; hpux10.20*|hpux11*) ! lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; *************** *** 3313,3319 **** *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case ! [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` --- 3362,3368 ---- *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case ! lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` *************** *** 3327,3347 **** lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ! [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] else ! [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] fi ;; newos6*) ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; --- 3376,3396 ---- lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ! lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' else ! lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' fi ;; newos6*) ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; *************** *** 3372,3385 **** lt_cv_file_magic_test_file=/lib/libc.so ;; ! [sysv5uw[78]* | sysv4*uw2*)] lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) --- 3421,3434 ---- lt_cv_file_magic_test_file=/lib/libc.so ;; ! sysv5uw[[78]]* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) *************** *** 3387,3397 **** ;; sequent) lt_cv_file_magic_cmd='/bin/file' ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;; sni) lt_cv_file_magic_cmd='/bin/file' ! [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"] lt_cv_file_magic_test_file=/lib/libc.so ;; esac --- 3436,3446 ---- ;; sequent) lt_cv_file_magic_cmd='/bin/file' ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; sni) lt_cv_file_magic_cmd='/bin/file' ! lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; esac *************** *** 3405,3417 **** # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], ! [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm --- 3454,3467 ---- # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], ! [AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ! AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm Index: libtool/ltdl.m4 diff -c libtool/ltdl.m4:1.21.2.2 libtool/ltdl.m4:1.21.2.4 *** libtool/ltdl.m4:1.21.2.2 Sun Sep 2 21:22:13 2001 --- libtool/ltdl.m4 Mon Sep 10 23:18:52 2001 *************** *** 32,37 **** --- 32,38 ---- AC_REQUIRE([AC_C_CONST]) AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_HEADER_DIRENT]) + AC_REQUIRE([AC_LIBTOOL_HEADER_ASSERT]) AC_REQUIRE([_LT_AC_CHECK_DLFCN]) AC_REQUIRE([AC_LTDL_ENABLE_INSTALL]) AC_REQUIRE([AC_LTDL_SHLIBEXT]) *************** *** 81,86 **** --- 82,90 ---- netbsd*) libltdl_cv_sys_dlopen_deplibs=yes ;; + openbsd*) + libltdl_cv_sys_dlopen_deplibs=yes + ;; solaris*) libltdl_cv_sys_dlopen_deplibs=yes ;; *************** *** 322,325 **** AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) ])# AC_LTDL_FUNC_ARGZ - --- 326,328 ---- Index: libtool/ltmain.in diff -c libtool/ltmain.in:1.259.2.7 libtool/ltmain.in:1.259.2.9 *** libtool/ltmain.in:1.259.2.7 Sun Sep 2 18:18:21 2001 --- libtool/ltmain.in Mon Sep 10 20:05:33 2001 *************** *** 84,89 **** --- 84,92 ---- save_LANG="$LANG"; LANG=C; export LANG fi + # Make sure IFS has a sensible default + : ${IFS=" "} + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then echo "$modename: not configured to build any kind of library" 1>&2 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 *************** *** 334,340 **** -Wc,*) args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" --- 337,343 ---- -Wc,*) args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= ! save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" *************** *** 1045,1052 **** test "X$arg" = "X-lc" && continue ;; esac ! fi ! if test "X$arg" = "X-lc_r"; then case $host in *-*-openbsd*) # Do not include libc_r directly, use -pthread flag. --- 1048,1054 ---- test "X$arg" = "X-lc" && continue ;; esac ! elif test "X$arg" = "X-lc_r"; then case $host in *-*-openbsd*) # Do not include libc_r directly, use -pthread flag. *************** *** 1143,1149 **** -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` arg= ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in --- 1145,1151 ---- -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` arg= ! save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in *************** *** 1161,1167 **** -Wl,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` arg= ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in --- 1163,1169 ---- -Wl,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` arg= ! save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in *************** *** 1771,1777 **** if test -f "$output_objdir/$soname-def"; then : else $show "extracting exported symbol list from \`$soname'" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' eval cmds=\"$extract_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" --- 1773,1779 ---- if test -f "$output_objdir/$soname-def"; then : else $show "extracting exported symbol list from \`$soname'" ! save_ifs="$IFS"; IFS='~' eval cmds=\"$extract_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" *************** *** 1784,1790 **** # Create $newlib if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' eval cmds=\"$old_archive_from_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" --- 1786,1792 ---- # Create $newlib if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" ! save_ifs="$IFS"; IFS='~' eval cmds=\"$old_archive_from_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" *************** *** 2196,2202 **** else # Parse the version information argument. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 IFS="$save_ifs" --- 2198,2204 ---- else # Parse the version information argument. ! save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 IFS="$save_ifs" *************** *** 2818,2824 **** export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 2820,2826 ---- export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 2894,2900 **** else eval cmds=\"$archive_cmds\" fi ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 2896,2902 ---- else eval cmds=\"$archive_cmds\" fi ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 3022,3028 **** output="$obj" eval cmds=\"$reload_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 3024,3030 ---- output="$obj" eval cmds=\"$reload_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 3058,3064 **** reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 3060,3066 ---- reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 3823,3829 **** eval cmds=\"$old_archive_cmds\" fi ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 3825,3831 ---- eval cmds=\"$old_archive_cmds\" fi ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4198,4204 **** # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4200,4206 ---- # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4385,4391 **** # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4387,4393 ---- # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4423,4429 **** if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4425,4431 ---- if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4699,4705 **** if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4701,4707 ---- if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4714,4720 **** if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4716,4722 ---- if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" Index: libtool/demo/Makefile.am diff -c libtool/demo/Makefile.am:1.23 libtool/demo/Makefile.am:1.23.2.1 *** libtool/demo/Makefile.am:1.23 Sun Apr 22 19:21:58 2001 --- libtool/demo/Makefile.am Mon Sep 3 18:06:19 2001 *************** *** 15,21 **** if BINARY_HELLDL BUILD_helldl = helldl else ! BUILD_helldl = endif bin_PROGRAMS = hell hell.static $(BUILD_helldl) --- 15,21 ---- if BINARY_HELLDL BUILD_helldl = helldl else ! BUILD_helldl = endif bin_PROGRAMS = hell hell.static $(BUILD_helldl) *************** *** 40,46 **** bin_SCRIPTS = helldl # create a script that says that -dlopen is not supported ! helldl: rm -f $@ echo '#! /bin/sh' > $@ echo '-dlopen is unsupported' >> $@ --- 40,46 ---- bin_SCRIPTS = helldl # create a script that says that -dlopen is not supported ! helldl helldl$(EXEEXT): rm -f $@ echo '#! /bin/sh' > $@ echo '-dlopen is unsupported' >> $@ Index: libtool/doc/PLATFORMS diff -c libtool/doc/PLATFORMS:1.42 libtool/doc/PLATFORMS:1.42.2.1 *** libtool/doc/PLATFORMS:1.42 Tue Apr 24 14:07:31 2001 --- libtool/doc/PLATFORMS Mon Sep 10 23:18:52 2001 *************** *** 59,65 **** i*86-*-netbsd1.2 gcc 0.9g ok i*86-*-linux-gnu gcc 1.3e ok (1.901) (Red Hat 7.0, gcc "2.96") ! i*86-*-linux-gnu gcc 1.3e ok (1.911) (SuSE 7.0, gcc 2.95.2) i*86-*-linux-gnulibc1 gcc 1.2f ok i*86-*-openbsd2.5 gcc 1.3c ok --- 59,65 ---- i*86-*-netbsd1.2 gcc 0.9g ok i*86-*-linux-gnu gcc 1.3e ok (1.901) (Red Hat 7.0, gcc "2.96") ! i*86-*-linux-gnu gcc 1.4.2 ok (SuSE 7.0, gcc 2.95.2) i*86-*-linux-gnulibc1 gcc 1.2f ok i*86-*-openbsd2.5 gcc 1.3c ok *************** *** 128,140 **** (gcc-2.7.2) rs6000-ibm-aix3.2.5 gcc 1.0i ok rs6000-ibm-aix3.2.5 xlc 1.0i ok ! sparc-sun-solaris2.8 gcc 1.3e ok (1.913) ! (gcc-2.95.3 & native ld) sparc-sun-solaris2.7 gcc 1.3e ok (1.913) (gcc-2.95.3 & native ld) sparc-sun-solaris2.6 gcc 1.3e ok (1.913) (gcc-2.95.3 & native ld) ! sparc-sun-solaris2.5.1 gcc 1.3e ok (1.911) sparc-sun-solaris2.5 gcc 1.3b ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) sparc-sun-solaris2.5 cc 1.3b ok --- 128,143 ---- (gcc-2.7.2) rs6000-ibm-aix3.2.5 gcc 1.0i ok rs6000-ibm-aix3.2.5 xlc 1.0i ok ! sparc-sun-solaris2.8 gcc 1.4.2 ok ! (gcc-2.95.2 & native ld) ! sparc-sun-solaris2.8 gcc 1.4.2 ok ! (gcc-3.0.1 & GNU ld 2.11.2) sparc-sun-solaris2.7 gcc 1.3e ok (1.913) (gcc-2.95.3 & native ld) sparc-sun-solaris2.6 gcc 1.3e ok (1.913) (gcc-2.95.3 & native ld) ! sparc-sun-solaris2.5.1 gcc 1.4.2 ok ! (gcc-2.95.1 & GNU ld 2.9.1) sparc-sun-solaris2.5 gcc 1.3b ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) sparc-sun-solaris2.5 cc 1.3b ok Index: libtool/doc/libtool.texi diff -c libtool/doc/libtool.texi:1.116 libtool/doc/libtool.texi:1.116.2.1 *** libtool/doc/libtool.texi:1.116 Thu Apr 5 19:43:39 2001 --- libtool/doc/libtool.texi Mon Sep 10 18:25:55 2001 *************** *** 1683,1689 **** @end defvar @defvar LDFLAGS ! The flags to be used by @code{ltconfig} when it links a program. If this is not set, @code{AC_PROG_LIBTOOL} will not use any such flags. It affects only the way @code{AC_PROG_LIBTOOL} runs tests, not the produced @code{libtool}. --- 1683,1689 ---- @end defvar @defvar LDFLAGS ! The flags to be used by @code{libtool} when it links a program. If this is not set, @code{AC_PROG_LIBTOOL} will not use any such flags. It affects only the way @code{AC_PROG_LIBTOOL} runs tests, not the produced @code{libtool}. *************** *** 3846,3852 **** the details needed to reproduce the bug, and a brief description of why you think the behaviour is a bug. Be sure to include the word ``libtool'' in the subject line, as well as the version number you are ! using (which can be found by typing @kbd{ltconfig --version}). @node Maintaining @chapter Maintenance notes for libtool --- 3846,3852 ---- the details needed to reproduce the bug, and a brief description of why you think the behaviour is a bug. Be sure to include the word ``libtool'' in the subject line, as well as the version number you are ! using (which can be found by typing @kbd{libtool --version}). @node Maintaining @chapter Maintenance notes for libtool Index: libtool/libltdl/Makefile.am diff -c libtool/libltdl/Makefile.am:1.40 libtool/libltdl/Makefile.am:1.40.2.1 *** libtool/libltdl/Makefile.am:1.40 Sun Jan 28 21:01:41 2001 --- libtool/libltdl/Makefile.am Mon Sep 10 21:22:03 2001 *************** *** 18,24 **** CLEANFILES = libltdl.la libltdlc.la libltdl_la_SOURCES = ltdl.c ! libltdl_la_LDFLAGS = -no-undefined -version-info 3:0:0 libltdl_la_LIBADD = $(LIBADD_DL) libltdlc_la_SOURCES = ltdl.c --- 18,24 ---- CLEANFILES = libltdl.la libltdlc.la libltdl_la_SOURCES = ltdl.c ! libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1 libltdl_la_LIBADD = $(LIBADD_DL) libltdlc_la_SOURCES = ltdl.c Index: libtool/libltdl/acconfig.h diff -c libtool/libltdl/acconfig.h:1.3 libtool/libltdl/acconfig.h:removed *** libtool/libltdl/acconfig.h:1.3 Thu Apr 29 04:09:19 1999 --- libtool/libltdl/acconfig.h Mon Sep 10 23:40:43 2001 *************** *** 1,12 **** - /* 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 --- 0 ---- Index: libtool/libltdl/configure.in diff -c libtool/libltdl/configure.in:1.56 libtool/libltdl/configure.in:1.56.2.2 *** libtool/libltdl/configure.in:1.56 Tue Apr 24 19:22:35 2001 --- libtool/libltdl/configure.in Mon Sep 10 22:04:24 2001 *************** *** 21,28 **** fi fi ! AM_INIT_AUTOMAKE(libltdl,1.1,-) ! AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE AC_PROG_CC --- 21,28 ---- fi fi ! AM_INIT_AUTOMAKE(libltdl,1.2,-) ! AM_CONFIG_HEADER(config.h:config-h.in) AM_MAINTAINER_MODE AC_PROG_CC Index: libtool/libltdl/ltdl.c diff -c libtool/libltdl/ltdl.c:1.134.2.3 libtool/libltdl/ltdl.c:1.134.2.6 *** libtool/libltdl/ltdl.c:1.134.2.3 Sun Sep 2 20:22:51 2001 --- libtool/libltdl/ltdl.c Mon Sep 10 23:18:52 2001 *************** *** 86,93 **** # include #endif ! /* I have never seen a system without this: */ ! #include #include "ltdl.h" --- 86,96 ---- # include #endif ! #if HAVE_ASSERT_H ! # include ! #else ! # define assert(arg) ((void) 0) ! #endif #include "ltdl.h" *************** *** 1969,1975 **** shuffled. Otherwise, attempt to open FILENAME as a module. */ if (prefix) { ! error += tryall_dlopen_module (handle, 0, prefix, filename); } else if (tryall_dlopen (handle, filename) != 0) { --- 1972,1979 ---- shuffled. Otherwise, attempt to open FILENAME as a module. */ if (prefix) { ! error += tryall_dlopen_module (handle, ! (const char *) 0, prefix, filename); } else if (tryall_dlopen (handle, filename) != 0) { *************** *** 2003,2009 **** /* try to open the installed module */ if (installed && libdir) { ! if (tryall_dlopen_module (handle, 0, libdir, dlname) == 0) return 0; } --- 2007,2014 ---- /* try to open the installed module */ if (installed && libdir) { ! if (tryall_dlopen_module (handle, ! (const char *) 0, libdir, dlname) == 0) return 0; } *************** *** 2016,2022 **** /* maybe it was moved to another directory */ { ! if (tryall_dlopen_module (handle, 0, dir, dlname) == 0) return 0; } } --- 2021,2028 ---- /* maybe it was moved to another directory */ { ! if (tryall_dlopen_module (handle, ! (const char *) 0, dir, dlname) == 0) return 0; } } *************** *** 2130,2142 **** lt_ptr data1; lt_ptr data2; { ! int result = 0; ! int filenamesize = 0; ! int lenbase = LT_STRLEN (base_name); ! int argz_len = 0; ! char *argz = 0; ! char *filename = 0; ! char *canonical = 0; LT_DLMUTEX_LOCK (); --- 2136,2148 ---- lt_ptr data1; lt_ptr data2; { ! int result = 0; ! int filenamesize = 0; ! int lenbase = LT_STRLEN (base_name); ! size_t argz_len = 0; ! char * argz = 0; ! char * filename = 0; ! char * canonical = 0; LT_DLMUTEX_LOCK (); Index: libtool/tests/quote.test diff -c libtool/tests/quote.test:1.4.2.1 libtool/tests/quote.test:1.4.2.2 *** libtool/tests/quote.test:1.4.2.1 Sat Jun 30 16:27:42 2001 --- libtool/tests/quote.test Mon Sep 10 18:25:55 2001 *************** *** 36,42 **** # This shell has a builtin print -r that does the trick. echo='print -r' elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then ! # If we have ksh, try running ltconfig again with it. CONFIG_SHELL=/bin/ksh export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"} --- 36,42 ---- # This shell has a builtin print -r that does the trick. echo='print -r' elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then ! # If we have ksh, try running $0 again with it. CONFIG_SHELL=/bin/ksh export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}