Index: libtool/AUTHORS diff -c libtool/AUTHORS:1.4.4.4 libtool/AUTHORS:1.4.4.5 *** libtool/AUTHORS:1.4.4.4 Thu Jul 1 07:48:43 1999 --- libtool/AUTHORS Tue Nov 2 04:36:21 1999 *************** *** 5,8 **** Gordon Matzigkeit. Designed and implemented libtool. Alexandre Oliva . Co-maintainer. Thomas Tanner . Co-maintainer. ! Gary V. Vaughan . Co-maintainer. --- 5,8 ---- Gordon Matzigkeit. Designed and implemented libtool. Alexandre Oliva . Co-maintainer. Thomas Tanner . Co-maintainer. ! Gary V. Vaughan . Co-maintainer. Index: libtool/ChangeLog diff -c libtool/ChangeLog:1.385.2.181 libtool/ChangeLog:1.385.2.196 *** libtool/ChangeLog:1.385.2.181 Fri Jul 2 08:49:11 1999 --- libtool/ChangeLog Tue Dec 7 13:47:57 1999 *************** *** 1,7 **** --- 1,215 ---- + 1999-12-07 Gary V. Vaughan + + GNU libtool 1.3.4 was released. + + * config.guess: updated from autoconf cvs. + * config.sub: ditto. + * NEWS: inserted todays date. + * configure.in: bumped version to 1.3.4. + * doc/PLATFORMS: tested on all the machines I have access to. + + 1999-12-06 Gary V. Vaughan + + From Tim Mooney + * ltconfig.in: split off the osf3 section, so that the osf4 and + osf5 sections can add `-msym' to arguments passed to the linker + for shared libs. + + 1999-12-03 Gary V. Vaughan + + * ltconfig.in (hardcode_into_libs): Remove the commented out + hardcode_into_libs reference. Doh! + 1999-12-03 Alexandre Oliva + + * ltconfig.in (ac_compile): Use $ac_ext instead of .c. + (ac_link): Likewise. + (dlfcn.h, ac_try): Do not add filename, it is already in + ac_compile. + Reported by Stephane Conversy + + * ltconfig.in (linux-gnu*): Disable hardcode_into_libs until it + works together with fast_install. + + * libtool.m4: Use host when --target is not specified. + + * configure.in: AC_SUBST variables that are used by ltconfig to + build libtool. + + * ltconfig.in (irix6*): Do not override deplibs_check_method + here. + + * libtool.m4: Do not AC_SUBST anything other than LIBTOOL. + + 1999-11-29 Gary V. Vaughan + + * ltconfig.in: Be friendlier to C++ compilers when testing + for dlopen support. + Reported by Stephan Kulow + + 1999-11-26 Gary V. Vaughan + + * libtool.m4: better use of $target instead of $host to support + cross compilation. + Reported by Sam Latinga + + 1999-11-02 Thomas Tanner + + * NEWS: updated + * ltmain.in: preserve $CC (reported by Tom Tromey) + * ltconfig.in: remove second occurence of sysv5 + * libltdl/Makefile.am: increment version number, fix typo + * libltdl/ltdl.c (lt_dlsym): don't report an error if the + libltdl-style symbol name wasn't found + + 1999-11-02 Wolfgang Rapp + + * ltconfig.in: add support for Unixware (sysv4.2uw2*) + + 1999-10-28 Stephane Conversy + + * ltmain.in (-DPIC): changed the order of pic flags a little to + prevent upsetting the sgi c++ compiler. + + 1999-10-03 Pavel Roskin + + * libltdl/Makefile.am: don't preserve file attributes when + installing the libltdl sources + + 1999-09-29 Gary V. Vaughan + + * ltconfig.in (whole-archive-flag-spec): I had been + wondering why my file system was filling up with empty + files named `71'... seems I forgot to hold in the + shift key when redirecting stderr, 2>&1. Doh! + + 1999-09-29 Vadim + + * ltconfig.in (sysv): More UW7 support. + + 1999-09-27 Manfred Weichel + + * ltconfig.in (sysv5): Added support required for shared + library linking on SCO UW7. + + 1999-09-14 Alexandre Oliva + + * ltconfig.in (CDPATH): Set to `:' instead of empty. + * ltmain.in (CDPATH): Likewise. + Reported by Greg McGary + + 1999-08-24 Thomas Tanner + + * ltconfig.in: use CC -E when checking for ELF support + on NetBSD (reported by Todd Vierling ) + + 1999-08-24 Boyd Gerber + + * ltconfig.in: add support for UnixWare 7.X.X + + 1999-08-24 Pavel Roskin + + * doc/libtool.texi: document use of noinst_LTLIBRARIES for + convenience libraries + + * ltconfig.in: check for freebsdelf3, not just freebsd3 + + * ltmain.in: enable workaround for freebsdelf3.0 + + 1999-08-24 Bert Driehuis + + * ltconfig.in: export_dynamic_flag_spec is -rdynamic on BSD/OS + + 1999-08-07 Alexandre Oliva + + * libltdl/COPYING.LIB: Update to version 2.1. + * libltdl/ltdl.h, libltdl/ltdl.c: Update FSF address. + + 1999-08-02 Olly Betts + + * doc/libtool.texi (Compile mode): typo correction. + (Link mode): and another. + (Release numbers): and another. + (Distributing libltdl): and another. + (Test descriptions): and another. + (libtool script contents): and one more. + + 1999-07-30 Pavel Roskin + + * ltmain.in: Ensure that gcc on HPsUX uses -fPIC, or else + initialised structures are sometimes emitted in the code section. + + 1999-07-29 Alexandre Oliva + + * ltmain.in: Fix creation of relative links to object files in + sub-dirs. + + 1999-07-24 Bert Driehuis + + * ltconfig.in: Updated bsdi4 soname specs to be more like + linux as discussed on the bsdi mailing list. + + 1999-07-19 Alexandre Oliva + + * doc/libtool.texi (Porting inter-library dependencies): Typos + Reported by Petter Reinholdtsen + + 1999-07-17 Thomas Tanner + + * libltdl/README: document the supported dlopen interfaces + + 1999-07-09 Olly Betts + + * doc/libtool.texi (C++ Libraries): fixed a typo. + + 1999-07-06 Gary V. Vaughan + + * README-alpha: improved the release instructions to mention + actual list addresses for announcements, and urls for upload + locations. + + 1999-07-03 Pavel Roskin + + * ltconfig.in: finish_cmds for FreeBSD removed + + 1999-10-16 Alexandre Oliva + + * libltdl/ltdl.c (lt_dlopen): Do not search paths when the + specified library is not just a basename. + + 1999-10-06 Gary V. Vaughan + + * ltconfig.in: Accept osf5. + Reported by Sascha Schumann + + 1999-10-04 Gary V. Vaughan + + * ltmain.in (-no-fast-install): Wrapper script used to add the + exeext on again when naming the wrapped executable. + + 1999-09-28 Albert Cheng + + * ltmain.in (shlibpath_var): ensure the variable is non-empty before + exporting it. + + 1999-09-22 Gary V. Vaughan + + * ltconfig.in (whole-archive-flag-spec): test whether the + version of GNU ld being used understands --whole-archive + before using it. + + 1999-07-30 Pavel Roskin + + * ltmain.in: Ensure that gcc on HPsUX uses -fPIC, or else + initialised structures are sometimes emitted in the code section. + 1999-07-02 Gary V. Vaughan + * configure.in: bumped version to 1.3.3a. + GNU libtool 1.3.3 was released. + * config.sub: updated from common. + * config.guess: ditto. * NEWS: inserted todays date. * configure.in: bumped version to 1.3.3. *************** *** 1021,1024 **** Continued in ChangeLog.0 ! $Revision: 1.385.2.181 $ $Date: 1999/07/02 15:49:11 $ --- 1229,1232 ---- Continued in ChangeLog.0 ! $Revision: 1.385.2.196 $ $Date: 1999/12/07 21:47:57 $ Index: libtool/NEWS diff -c libtool/NEWS:1.24.2.25 libtool/NEWS:1.24.2.29 *** libtool/NEWS:1.24.2.25 Fri Jul 2 08:46:36 1999 --- libtool/NEWS Tue Dec 7 13:43:23 1999 *************** *** 1,5 **** --- 1,11 ---- NEWS - list of user-visible changes between releases of GNU Libtool + New in 1.3.4: 1999-12-08, CVS version 1.3.3a, Libtool team: + * Support for Compaq Tru64 V5.0. + * Improved support for Digatal Unix V4.*. + * Improved support for NetBSD, FreeBSD and Unixware. + * Many fine bugfixes. + New in 1.3.3: 1999-07-02, CVS version 1.3.2a, Libtool team: * New `-dlpreopen force' flag to ensure that lt_preloaded_symbols is always defined. Index: libtool/README-alpha diff -c libtool/README-alpha:1.5.2.2 libtool/README-alpha:1.5.2.3 *** libtool/README-alpha:1.5.2.2 Thu Apr 29 03:48:23 1999 --- libtool/README-alpha Tue Nov 2 04:36:22 1999 *************** *** 67,76 **** * Commit ! * Run `make cvs-dist' ! * Put new release on ftp site and send announcement. ! (If not an alpha, announcement must also go to FSF.) * Update version number in configure.in to next alpha number. ! Commit. --- 67,91 ---- * Commit ! * Run `make cvs-dist' which will tag the tree with release-maj-min. ! * Run `make cvs-diff' which will create a diff file against the previous ! release tag (set OLDVERSION=min.maj in the environment beforehand ! if necessary). + * Get a copy of the previous release tarball (by reverse applying the diff, + or downloading from gnu.org), and generate an xdelta with: + + xdelta delta libtool-.tar.gz libtool-.tar.gz > \ + libtool--.tar.xdp.gz' + + * Upload release tarball, diff file and xdelta file + ftp://melange/~ftp/gnu/libtool and send announcement to libtool@gnu.org. + + * If not an alpha, announcement must also go to info-gnu@gnu.org, and an + upload request be sent to ftp-upload@gnu.org requesting files be transferred + from ftp://alpha.gnu,org/gnu/libtool to ftp://ftp.gnu.org/gnu/libtool. + * Update version number in configure.in to next alpha number. ! ! * Commit. Index: libtool/config.guess diff -c libtool/config.guess:1.3.2.4 libtool/config.guess:1.3.2.5 *** libtool/config.guess:1.3.2.4 Tue May 25 17:06:10 1999 --- libtool/config.guess Tue Dec 7 13:43:23 1999 *************** *** 24,30 **** # Written by Per Bothner . # The master version of this file is at the FSF in /home/gd/gnu/lib. ! # Please send patches to the Autoconf mailing list . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and --- 24,30 ---- # Written by Per Bothner . # The master version of this file is at the FSF in /home/gd/gnu/lib. ! # Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and *************** *** 156,161 **** --- 156,164 ---- wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; *************** *** 328,342 **** AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` ! if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then ! if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ ! -o ${TARGET_BINARY_INTERFACE}x = x ] ; then echo m88k-dg-dgux${UNAME_RELEASE} ! else echo m88k-dg-dguxbcs${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 --- 331,348 ---- AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` ! if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] ! then ! if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ! [ ${TARGET_BINARY_INTERFACE}x = x ] ! then echo m88k-dg-dgux${UNAME_RELEASE} ! else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 *************** *** 453,459 **** exit (0); } EOF ! ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` --- 459,465 ---- exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` *************** *** 550,556 **** echo t90-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY*T3E:*:*:*) ! echo t3e-cray-unicosmk${UNAME_RELEASE} exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos --- 556,562 ---- echo t90-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY*T3E:*:*:*) ! echo alpha-cray-unicosmk${UNAME_RELEASE} exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos *************** *** 588,594 **** echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:NetBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` --- 594,600 ---- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:NetBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` *************** *** 618,629 **** echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - armv*) UNAME_MACHINE=$UNAME_MACHINE ;; - arm* | sa110*) UNAME_MACHINE="arm" ;; - esac # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent --- 624,629 ---- *************** *** 636,646 **** s/ .*// p'` case "$ld_supported_emulations" in ! i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; ! i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; ! sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; ! armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; ! m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; elf32ppc) # Determine Lib Version cat >$dummy.c <$dummy.c </dev/null 2>/dev/null; then ! echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} fi exit 0 ;; i?86:*:5:7*) ! UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` ! (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 ! (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 ! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 ! echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then --- 826,846 ---- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then ! echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; i?86:*:5:7*) ! # Fixed at (any) Pentium or better ! UNAME_MACHINE=i586 ! if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then ! echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} ! else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} ! fi exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then *************** *** 942,947 **** --- 973,981 ---- exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:QNX:*:4*) + echo i386-qnx-qnx${UNAME_VERSION} exit 0 ;; esac Index: libtool/config.sub diff -c libtool/config.sub:1.3.2.3 libtool/config.sub:1.3.2.4 *** libtool/config.sub:1.3.2.3 Fri May 21 08:41:09 1999 --- libtool/config.sub Tue Dec 7 13:43:23 1999 *************** *** 105,111 **** -scout) ;; -wrs) ! os=vxworks basic_machine=$1 ;; -hiux*) --- 105,111 ---- -scout) ;; -wrs) ! os=-vxworks basic_machine=$1 ;; -hiux*) *************** *** 156,168 **** -psos*) os=-psos ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. ! tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ --- 156,172 ---- -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. ! tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ *************** *** 171,182 **** | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ! | mips64vr5000 | miprs64vr5000el \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ ! | thumb | d10v) basic_machine=$basic_machine-unknown ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) ;; # We use `pc' rather than `unknown' --- 175,186 ---- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ! | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ ! | thumb | d10v | fr30) basic_machine=$basic_machine-unknown ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) ;; # We use `pc' rather than `unknown' *************** *** 191,197 **** exit 1 ;; # Recognize the basic CPU types with company name. ! vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ --- 195,202 ---- exit 1 ;; # Recognize the basic CPU types with company name. ! # FIXME: clean up the formatting here. ! vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ *************** *** 204,213 **** | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ ! | mipstx39-* | mipstx39el-* \ | f301-* | armv*-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ! | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. --- 209,218 ---- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ ! | mipstx39-* | mipstx39el-* | mcore-* \ | f301-* | armv*-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ! | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. *************** *** 425,431 **** ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) --- 430,435 ---- *************** *** 460,465 **** --- 464,472 ---- basic_machine=i386-unknown os=-mingw32 ;; + i386-qnx | qnx) + basic_machine=i386-qnx + ;; iris | iris4d) basic_machine=mips-sgi case $os in *************** *** 488,494 **** miniframe) basic_machine=m68000-convergent ;; ! *mint | *MiNT) basic_machine=m68k-atari os=-mint ;; --- 495,501 ---- miniframe) basic_machine=m68000-convergent ;; ! *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; *************** *** 514,519 **** --- 521,530 ---- basic_machine=i386-unknown os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 *************** *** 523,529 **** os=-netbsd ;; netwinder) ! basic_machine=armv4l-corel os=-linux ;; news | news700 | news800 | news900) --- 534,540 ---- os=-netbsd ;; netwinder) ! basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) *************** *** 907,913 **** | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ --- 918,924 ---- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ *************** *** 926,931 **** --- 937,945 ---- -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; -osfrose*) os=-osfrose ;; *************** *** 963,968 **** --- 977,985 ---- -oss*) os=-sysv3 ;; + -qnx) + os=-qnx4 + ;; -svr4) os=-sysv4 ;; *************** *** 1012,1018 **** *-acorn) os=-riscix1.2 ;; ! arm*-corel) os=-linux ;; arm*-semi) --- 1029,1035 ---- *-acorn) os=-riscix1.2 ;; ! arm*-rebel) os=-linux ;; arm*-semi) *************** *** 1186,1192 **** -genix*) vendor=ns ;; ! -mvs*) vendor=ibm ;; -ptx*) --- 1203,1209 ---- -genix*) vendor=ns ;; ! -mvs* | -opened*) vendor=ibm ;; -ptx*) Index: libtool/configure.in diff -c libtool/configure.in:1.26.2.9 libtool/configure.in:1.26.2.14 *** libtool/configure.in:1.26.2.9 Fri Jul 2 08:49:11 1999 --- libtool/configure.in Tue Dec 7 13:43:23 1999 *************** *** 2,8 **** AC_INIT(ltmain.in) ! AM_INIT_AUTOMAKE(libtool, 1.3.3) # 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.3.4) # 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 *************** *** 33,39 **** --- 33,41 ---- AC_PROG_CC AC_PROG_RANLIB AM_PROG_LD + AC_SUBST(LD) AM_PROG_NM + AC_SUBST(NM) AC_PROG_LN_S dnl For the `lineno' script (which puts line numbers into `ltconfig'). *************** *** 43,48 **** --- 45,51 ---- AC_LIBTOOL_DLOPEN AC_LIBTOOL_SETUP AC_SUBST(DLLTOOL) + AC_SUBST(FILE) AC_SUBST(OBJDUMP) AC_SUBST(AS) Index: libtool/libtool.m4 diff -c libtool/libtool.m4:1.35.2.18 libtool/libtool.m4:1.35.2.20 *** libtool/libtool.m4:1.35.2.18 Thu May 20 10:53:21 1999 --- libtool/libtool.m4 Fri Dec 3 03:03:01 1999 *************** *** 34,40 **** LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ ! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || AC_MSG_ERROR([libtool configure failed]) # Reload cache, that may have been modified by ltconfig --- 34,40 ---- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ ! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ || AC_MSG_ERROR([libtool configure failed]) # Reload cache, that may have been modified by ltconfig *************** *** 66,71 **** --- 66,76 ---- AC_REQUIRE([AC_PROG_LN_S])dnl dnl + case "$target" in + NONE) lt_target="$host" ;; + *) lt_target="$target" ;; + esac + # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" *************** *** 84,90 **** # Some flags need to be propagated to the compiler or linker for good # libtool support. ! case "$host" in *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext --- 89,95 ---- # Some flags need to be propagated to the compiler or linker for good # libtool support. ! case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext *************** *** 300,306 **** AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) - AC_SUBST(LD) AC_PROG_LD_GNU ]) --- 305,310 ---- *************** *** 346,359 **** fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) - AC_SUBST(NM) ]) # AC_CHECK_LIBM - check for math library AC_DEFUN(AC_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= ! case "$host" in *-*-beos* | *-*-cygwin*) # These system don't have libm ;; --- 350,362 ---- fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) ]) # AC_CHECK_LIBM - check for math library AC_DEFUN(AC_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= ! case "$lt_target" in *-*-beos* | *-*-cygwin*) # These system don't have libm ;; Index: libtool/ltconfig.in diff -c libtool/ltconfig.in:1.125.2.68 libtool/ltconfig.in:1.125.2.75 *** libtool/ltconfig.in:1.125.2.68 Tue Jun 29 01:56:55 1999 --- libtool/ltconfig.in Mon Dec 6 02:09:59 1999 *************** *** 53,59 **** # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. ! if test "X${PATH_SEPARATOR+set}" != "Xset"; then UNAME=${UNAME-`uname 2>/dev/null`} case X$UNAME in *-DOS) PATH_SEPARATOR=';' ;; --- 53,59 ---- # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. ! if test "X${PATH_SEPARATOR+set}" != Xset; then UNAME=${UNAME-`uname 2>/dev/null`} case X$UNAME in *-DOS) PATH_SEPARATOR=';' ;; *************** *** 63,71 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi ! if test "X${echo_test_string+set}" != "Xset"; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... --- 63,71 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ! if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... *************** *** 171,178 **** PACKAGE=@PACKAGE@ VERSION=@VERSION@ TIMESTAMP="@TIMESTAMP@" ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' rm="rm -f" help="Try \`$progname --help' for more information." --- 171,178 ---- PACKAGE=@PACKAGE@ VERSION=@VERSION@ TIMESTAMP="@TIMESTAMP@" ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' rm="rm -f" help="Try \`$progname --help' for more information." *************** *** 369,376 **** # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ! if test "${LANG+set}" = set; then LANG=C; export LANG; fi if test -n "$cache_file" && test -r "$cache_file"; then echo "loading cache $cache_file within ltconfig" --- 369,376 ---- # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi ! if test "X${LANG+set}" = Xset; then LANG=C; export LANG; fi if test -n "$cache_file" && test -r "$cache_file"; then echo "loading cache $cache_file within ltconfig" *************** *** 462,468 **** # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "${COLLECT_NAMES+set}" != set; then COLLECT_NAMES= export COLLECT_NAMES fi --- 462,468 ---- # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi *************** *** 663,669 **** link_static_flag='-static' case "$host_os" in ! beos* | irix5* | irix6* | osf3* | osf4*) # PIC is the default for these OSes. ;; aix*) --- 663,669 ---- link_static_flag='-static' case "$host_os" in ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; aix*) *************** *** 718,724 **** # We can build DLLs from non-PIC. ;; ! osf3* | osf4*) # All OSF/1 code is PIC. wl='-Wl,' link_static_flag='-non_shared' --- 718,724 ---- # We can build DLLs from non-PIC. ;; ! osf3* | osf4* | osf5*) # All OSF/1 code is PIC. wl='-Wl,' link_static_flag='-non_shared' *************** *** 1187,1193 **** ;; netbsd*) ! if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else --- 1187,1193 ---- ;; netbsd*) ! if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else *************** *** 1196,1202 **** fi ;; ! solaris*) if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <&2 --- 1196,1202 ---- fi ;; ! solaris* | sysv5*) if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <&2 *************** *** 1244,1250 **** whole_archive_flag_spec= ;; *) ! whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ;; esac fi --- 1244,1255 ---- whole_archive_flag_spec= ;; *) ! # ancient GNU ld didn't support --whole-archive et. al. ! if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then ! whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ! else ! whole_archive_flag_spec= ! fi ;; esac fi *************** *** 1405,1411 **** old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' ;; ! osf3* | osf4*) if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' --- 1410,1416 ---- old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' ;; ! osf3*) if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' *************** *** 1417,1422 **** --- 1422,1439 ---- hardcode_libdir_separator=: ;; + osf4* | osf5*) # As osf3* with the addition of the -msym flag + if test "$with_gcc" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + sco3.2v5*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_shlibpath_var=no *************** *** 1461,1466 **** --- 1478,1495 ---- export_dynamic_flag_spec='-Bexport' ;; + sysv5*) + no_undefined_flag=' -z text' + # $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 $linkopts' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' + hardcode_libdir_flag_spec= + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + ;; + uts4*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' *************** *** 1474,1489 **** ;; sysv4*MP*) ! if test -d /usr/nec ;then ! # archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs' ! archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs' hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH hardcode_runpath_var=yes ! ld_shlibs=yes ! fi ;; *) ld_shlibs=no ;; --- 1503,1532 ---- ;; sysv4*MP*) ! if test -d /usr/nec; then ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' ! hardcode_shlibpath_var=no ! runpath_var=LD_RUN_PATH ! hardcode_runpath_var=yes ! ld_shlibs=yes ! fi ! ;; ! ! sysv4.2uw2*) ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' ! hardcode_direct=yes ! hardcode_minus_L=no hardcode_shlibpath_var=no hardcode_runpath_var=yes ! runpath_var=LD_RUN_PATH ;; + unixware7*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + *) ld_shlibs=no ;; *************** *** 1787,1794 **** bsdi4*) version_type=linux ! library_names_spec='${libname}.so$major ${libname}.so' ! soname_spec='${libname}.so' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' --- 1830,1838 ---- bsdi4*) version_type=linux ! need_version=no ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! soname_spec='${libname}${release}.so$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' *************** *** 1796,1801 **** --- 1840,1846 ---- file_magic_test_file=/shlib/libc.so sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + export_dynamic_flag_spec=-rdynamic # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs *************** *** 1841,1850 **** need_version=yes ;; esac - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH case "$host_os" in ! freebsd2* | freebsd3.[01]*) shlibpath_overrides_runpath=yes ;; *) # from 3.2 on --- 1886,1894 ---- need_version=yes ;; esac shlibpath_var=LD_LIBRARY_PATH case "$host_os" in ! freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes ;; *) # from 3.2 on *************** *** 1896,1903 **** *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; *) libsuff= shlibsuff= libmagic=never-match;; esac - # this will be overridden with pass_all, but let us keep it just in case - deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" ;; esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH --- 1940,1945 ---- *************** *** 1972,1978 **** shlibpath_var=LIBPATH ;; ! osf3* | osf4*) version_type=osf need_version=no soname_spec='${libname}${release}.so' --- 2014,2020 ---- shlibpath_var=LIBPATH ;; ! osf3* | osf4* | osf5*) version_type=osf need_version=no soname_spec='${libname}${release}.so' *************** *** 2179,2184 **** --- 2221,2229 ---- /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif char dlopen(); int main() { *************** *** 2216,2221 **** --- 2261,2269 ---- /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif char dlopen(); int main() { *************** *** 2260,2265 **** --- 2308,2316 ---- /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif char dld_link(); int main() { *************** *** 2297,2302 **** --- 2348,2356 ---- /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif char shl_load(); int main() { *************** *** 2343,2348 **** --- 2397,2405 ---- /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif char shl_load(); int main() { *************** *** 2401,2407 **** #include <$ac_hdr> int fnord = 0; EOF ! ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo $progname:@LINENO@: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 2458,2464 ---- #include <$ac_hdr> int fnord = 0; EOF ! ac_try="$ac_compile >/dev/null 2>conftest.out" { (eval echo $progname:@LINENO@: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 2649,2655 **** # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 2706,2712 ---- # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 2675,2681 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi ### BEGIN LIBTOOL CONFIG EOF --- 2732,2738 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ### BEGIN LIBTOOL CONFIG EOF *************** *** 2938,2944 **** # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "${COLLECT_NAMES+set}" != set; then COLLECT_NAMES= export COLLECT_NAMES fi --- 2995,3001 ---- # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi *************** *** 2948,2953 **** --- 3005,3014 ---- # Append the ltmain.sh script. sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? chmod +x "$ofile" ;; Index: libtool/ltmain.in diff -c libtool/ltmain.in:1.135.2.40 libtool/ltmain.in:1.135.2.44 *** libtool/ltmain.in:1.135.2.40 Tue Jun 29 10:38:09 1999 --- libtool/ltmain.in Tue Nov 2 04:36:22 1999 *************** *** 435,441 **** fbsd_hideous_sh_bug=$base_compile # All platforms use -DPIC, to notify preprocessed assembler code. ! command="$base_compile $pic_flag -DPIC $srcfile" if test "$build_old_libs" = yes; then lo_libobj="$libobj" dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` --- 435,441 ---- fbsd_hideous_sh_bug=$base_compile # All platforms use -DPIC, to notify preprocessed assembler code. ! command="$base_compile $srcfile $pic_flag -DPIC" if test "$build_old_libs" = yes; then lo_libobj="$libobj" dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` *************** *** 521,529 **** exit $error fi # Now arrange that obj and lo_libobj become the same file ! $show "$LN_S $obj $lo_libobj" ! if $run $LN_S $obj $lo_libobj; then exit 0 else error=$? --- 521,537 ---- exit $error fi + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` + libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` # Now arrange that obj and lo_libobj become the same file ! $show "(cd $xdir && $LN_S $baseobj $libobj)" ! if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then exit 0 else error=$? *************** *** 613,620 **** # libtool link mode link) modename="$modename: link" - C_compiler="$CC" # save it, to compile generated C sources - CC="$nonopt" case "$host" in *-*-cygwin* | *-*-mingw* | *-*-os2*) # It is impossible to link a dll without this setting, and --- 621,626 ---- *************** *** 802,809 **** allow_undefined=yes ;; esac ! compile_command="$CC" ! finalize_command="$CC" compile_rpath= finalize_rpath= --- 808,815 ---- allow_undefined=yes ;; esac ! compile_command="$nonopt" ! finalize_command="$nonopt" compile_rpath= finalize_rpath= *************** *** 1851,1857 **** int main() { return 0; } EOF $rm conftest ! $C_compiler -o conftest conftest.c $deplibs if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do --- 1857,1863 ---- int main() { return 0; } EOF $rm conftest ! $CC -o conftest conftest.c $deplibs if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do *************** *** 1884,1890 **** # If $name is empty we are operating on a -L argument. if test "$name" != "" ; then $rm conftest ! $C_compiler -o conftest conftest.c $i # Did it work? if test $? -eq 0 ; then ldd_output=`ldd conftest` --- 1890,1896 ---- # If $name is empty we are operating on a -L argument. if test "$name" != "" ; then $rm conftest ! $CC -o conftest conftest.c $i # Did it work? if test $? -eq 0 ; then ldd_output=`ldd conftest` *************** *** 2047,2059 **** done # Ensure that we have .o objects for linkers which dislike .lo ! # (e.g. aix) incase we are running --disable-static for obj in $libobjs; do ! oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"` ! if test ! -f $oldobj; then ! $show "${LN_S} $obj $oldobj" ! $run ${LN_S} $obj $oldobj || exit $? fi done # Use standard objects if they are pic --- 2053,2072 ---- done # Ensure that we have .o objects for linkers which dislike .lo ! # (e.g. aix) in case we are running --disable-static for obj in $libobjs; do ! xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` ! if test "X$xdir" = "X$obj"; then ! xdir="." ! else ! xdir="$xdir" fi + baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` + if test ! -f $xdir/$oldobj; then + $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" + $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? + fi done # Use standard objects if they are pic *************** *** 2311,2318 **** # Just create a symlink. $show $rm $libobj $run $rm $libobj ! $show "$LN_S $obj $libobj" ! $run $LN_S $obj $libobj || exit $? fi if test -n "$gentop"; then --- 2324,2339 ---- # Just create a symlink. $show $rm $libobj $run $rm $libobj ! xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` ! if test "X$xdir" = "X$libobj"; then ! xdir="." ! else ! xdir="$xdir" ! fi ! baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` ! oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` ! $show "(cd $xdir && $LN_S $oldobj $baseobj)" ! $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? fi if test -n "$gentop"; then *************** *** 2598,2613 **** # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ! *-*-freebsd2*|*-*-freebsd3.0*) case "$compile_command " in *" -static "*) ;; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; esac esac # Now compile the dynamic symbol file. ! $show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ! $run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" --- 2619,2639 ---- # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ! *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) case "$compile_command " in *" -static "*) ;; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + esac;; + *-*-hpux*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC";; esac esac # Now compile the dynamic symbol file. ! $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ! $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" *************** *** 2776,2782 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi relink_command=\"$relink_command\" --- 2802,2808 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" *************** *** 2865,2871 **** fi" else echo >> $output "\ ! program='$outputname$exeext' progdir=\"\$thisdir/$objdir\" " fi --- 2891,2897 ---- fi" else echo >> $output "\ ! program='$outputname' progdir=\"\$thisdir/$objdir\" " fi *************** *** 2995,3008 **** if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then eval cmds=\"$old_archive_from_new_cmds\" else ! # Ensure that we have .o objects in place incase we decided # not to build a shared library, and have fallen back to building # static libs even though --disable-static was passed! for oldobj in $oldobjs; do if test ! -f $oldobj; then ! obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"` ! $show "${LN_S} $obj $oldobj" ! $run ${LN_S} $obj $oldobj || exit $? fi done --- 3021,3041 ---- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then eval cmds=\"$old_archive_from_new_cmds\" else ! # Ensure that we have .o objects in place in case we decided # not to build a shared library, and have fallen back to building # static libs even though --disable-static was passed! for oldobj in $oldobjs; do if test ! -f $oldobj; then ! xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` ! if test "X$xdir" = "X$oldobj"; then ! xdir="." ! else ! xdir="$xdir" ! fi ! baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` ! obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` ! $show "(cd $xdir && ${LN_S} $obj $baseobj)" ! $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? fi done *************** *** 3672,3679 **** done if test -z "$run"; then ! # Export the shlibpath_var. ! eval "export $shlibpath_var" # Restore saved enviroment variables if test "${save_LC_ALL+set}" = set; then --- 3705,3714 ---- done if test -z "$run"; then ! if test -n "$shlibpath_var"; then ! # Export the shlibpath_var. ! eval "export $shlibpath_var" ! fi # Restore saved enviroment variables if test "${save_LC_ALL+set}" = set; then *************** *** 3690,3697 **** exit 1 else # Display what would be done. ! eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" ! $echo "export $shlibpath_var" $echo "$cmd$args" exit 0 fi --- 3725,3734 ---- exit 1 else # Display what would be done. ! if test -n "$shlibpath_var"; then ! eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" ! $echo "export $shlibpath_var" ! fi $echo "$cmd$args" exit 0 fi Index: libtool/doc/PLATFORMS diff -c libtool/doc/PLATFORMS:1.13.2.14 libtool/doc/PLATFORMS:1.13.2.15 *** libtool/doc/PLATFORMS:1.13.2.14 Fri Jul 2 05:01:08 1999 --- libtool/doc/PLATFORMS Tue Dec 7 13:43:23 1999 *************** *** 11,19 **** alpha*-unknown-linux-gnu gcc 1.3.3 ok (egcs-1.1.2, GNU ld 2.9.1.0.23) hppa2.0w-hp-hpux11.00 cc 1.2f ok ! hppa2.0-hp-hpux10.20 cc 1.3.2 ok ! hppa1.1-hp-hpux10.20 gcc 1.2f ok ! hppa1.1-hp-hpux10.20 cc 1.2f ok hppa1.1-hp-hpux10.10 gcc 1.2f ok hppa1.1-hp-hpux10.10 cc 1.2f ok hppa1.1-hp-hpux9.07 gcc 1.2f ok --- 11,19 ---- alpha*-unknown-linux-gnu gcc 1.3.3 ok (egcs-1.1.2, GNU ld 2.9.1.0.23) hppa2.0w-hp-hpux11.00 cc 1.2f ok ! hppa2.0-hp-hpux10.20 cc 1.3.4 ok ! hppa1.1-hp-hpux10.20 gcc 1.3.4 ok ! hppa1.1-hp-hpux10.20 cc 1.3.4 ok hppa1.1-hp-hpux10.10 gcc 1.2f ok hppa1.1-hp-hpux10.10 cc 1.2f ok hppa1.1-hp-hpux9.07 gcc 1.2f ok *************** *** 28,34 **** i*86-*-bsdi3.1 gcc 1.2e NS i*86-*-bsdi3.0 gcc 1.2e NS i*86-*-bsdi2.1 gcc 1.2e NS ! i*86-pc-cygwin gcc 1.3.2 NS (egcs-1.1 stock b20.1 compiler) i*86-*-dguxR4.20MU01 gcc 1.2 ok i*86-*-freebsdelf4.0 gcc 1.2f ok --- 28,34 ---- i*86-*-bsdi3.1 gcc 1.2e NS i*86-*-bsdi3.0 gcc 1.2e NS i*86-*-bsdi2.1 gcc 1.2e NS ! i*86-pc-cygwin gcc 1.3.4 NS (egcs-1.1 stock b20.1 compiler) i*86-*-dguxR4.20MU01 gcc 1.2 ok i*86-*-freebsdelf4.0 gcc 1.2f ok *************** *** 47,54 **** i*86-*-netbsd1.3I gcc 1.2e ok (egcs 1.1?) i*86-*-netbsd1.2 gcc 0.9g ok ! i*86-*-linux-gnu gcc 1.3.3 ok ! (egcs-1.1.2, GNU ld 2.9.1.0.23) i*86-*-linux-gnulibc1 gcc 1.2f ok i*86-*-openbsd2.4 gcc 1.2f ok i*86-*-solaris2.7 gcc 1.3.3 ok --- 47,54 ---- i*86-*-netbsd1.3I gcc 1.2e ok (egcs 1.1?) i*86-*-netbsd1.2 gcc 0.9g ok ! i*86-*-linux-gnu gcc 1.3.4 ok ! (gcc-2.95.2, GNU ld 2.9.5) i*86-*-linux-gnulibc1 gcc 1.2f ok i*86-*-openbsd2.4 gcc 1.2f ok i*86-*-solaris2.7 gcc 1.3.3 ok Index: libtool/doc/libtool.texi diff -c libtool/doc/libtool.texi:1.47.2.26 libtool/doc/libtool.texi:1.47.2.27 *** libtool/doc/libtool.texi:1.47.2.26 Tue Jun 29 10:38:10 1999 --- libtool/doc/libtool.texi Tue Nov 2 04:36:23 1999 *************** *** 670,676 **** burger$ @end example ! Libtool's way is almost the same@footnote{However, you should never use @samp{-L} or @samp{-l} flags to link against an uninstalled libtool library. Just specify the relative path to the @samp{.la} file, such as @file{../intl/libintl.la}. This is a design decision to eliminate any --- 670,676 ---- burger$ @end example ! Libtool's way is almost the same@footnote{However, you should avoid using @samp{-L} or @samp{-l} flags to link against an uninstalled libtool library. Just specify the relative path to the @samp{.la} file, such as @file{../intl/libintl.la}. This is a design decision to eliminate any *************** *** 1024,1029 **** --- 1024,1033 ---- directly or indirectly, into a single program or library, otherwise you may get errors about symbol redefinitions. + When GNU automake is used, you should use @code{noinst_LTLIBRARIES} + instead of @code{lib_LTLIBRARIES} for convenience libraries, so that + the @samp{-rpath} option is not passed when they are linked. + As a rule of thumb, link a libtool convenience library into at most one libtool library, and never into a program, and link libtool static convenience libraries only into programs, and only if you need to carry *************** *** 1133,1139 **** Libtool determines the name of the output file by removing the directory component from the source file name, then substituting the source code ! suffix (e.g. @samp{.c} for C soure code) with the library object suffix, @samp{.lo}. If shared libraries are being built, any necessary PIC generation flags --- 1137,1143 ---- Libtool determines the name of the output file by removing the directory component from the source file name, then substituting the source code ! suffix (e.g. @samp{.c} for C source code) with the library object suffix, @samp{.lo}. If shared libraries are being built, any necessary PIC generation flags *************** *** 1233,1239 **** executable. @item -module ! Creates a library that can be dlopenend (@pxref{Dlopened modules}). This option doesn't work for programs. Module names don't need to be prefixed with 'lib'. In order to prevent name clashes, however, 'libname' and 'name' --- 1237,1243 ---- executable. @item -module ! Creates a library that can be dlopened (@pxref{Dlopened modules}). This option doesn't work for programs. Module names don't need to be prefixed with 'lib'. In order to prevent name clashes, however, 'libname' and 'name' *************** *** 2223,2229 **** at the same time that the release number does, and the library suffix is never the same across all platforms. ! So, in order to accomodate both views, you can use the @samp{-release} flag in order to set release information for libraries which you do not want to use @samp{-version-info}. For the @file{libbfd} example, the next release which uses libtool should be built with @samp{-release --- 2227,2233 ---- at the same time that the release number does, and the library suffix is never the same across all platforms. ! So, in order to accommodate both views, you can use the @samp{-release} flag in order to set release information for libraries which you do not want to use @samp{-version-info}. For the @file{libbfd} example, the next release which uses libtool should be built with @samp{-release *************** *** 3086,3092 **** dlpreopening, which is probably not what you want. Avoid using the @code{-static} or @code{-all-static} switches when ! linking programs with libltdl. This will not work on all plaforms, because the dlopening functions may not be available for static linking. The following example shows you how to embed the convenience libltdl in --- 3090,3096 ---- dlpreopening, which is probably not what you want. Avoid using the @code{-static} or @code{-all-static} switches when ! linking programs with libltdl. This will not work on all platforms, because the dlopening functions may not be available for static linking. The following example shows you how to embed the convenience libltdl in *************** *** 3152,3158 **** @cindex C++, pitfalls Creating libraries of C++ code should be a fairly straightforward ! process, because its object files differ from C ones in only two ways: @enumerate 1 @item --- 3156,3162 ---- @cindex C++, pitfalls Creating libraries of C++ code should be a fairly straightforward ! process, because its object files differ from C ones in only three ways: @enumerate 1 @item *************** *** 3378,3384 **** @item sh.test @pindex sh.test ! Checks whether a `test' command was forgotton in libtool. @item suffix.test @pindex suffix.test --- 3382,3388 ---- @item sh.test @pindex sh.test ! Checks whether a `test' command was forgotten in libtool. @item suffix.test @pindex suffix.test *************** *** 3579,3585 **** @samp{archive_cmds} can contain deplibs on all platforms, but not have deplibs used unless needed. ! @item unkwnon @vindex unknown is the default for all systems unless overridden in @file{ltconfig.in}. It is the same as @samp{none}, but it documents that we really don't --- 3583,3589 ---- @samp{archive_cmds} can contain deplibs on all platforms, but not have deplibs used unless needed. ! @item unknown @vindex unknown is the default for all systems unless overridden in @file{ltconfig.in}. It is the same as @samp{none}, but it documents that we really don't *************** *** 3587,3593 **** improve it. @end table ! Then in @file{ltmain.in} we have the real workhorse: a litle initialization and postprocessing (to setup/release variables for use with eval echo libname_spec etc.) and a case statement that decides which method is being used. This is the real code... I wish I could --- 3591,3597 ---- improve it. @end table ! Then in @file{ltmain.in} we have the real workhorse: a little initialization and postprocessing (to setup/release variables for use with eval echo libname_spec etc.) and a case statement that decides which method is being used. This is the real code... I wish I could *************** *** 4001,4007 **** means the same as @samp{yes}, but documents that we are not really sure about it. @samp{yes} means that it is possible both to @code{dlopen} and to ! link against a library wihthout 'lib' prefix, i.e. it requires @var{hardcode_direct} to be @samp{yes}. @end defvar --- 4005,4011 ---- means the same as @samp{yes}, but documents that we are not really sure about it. @samp{yes} means that it is possible both to @code{dlopen} and to ! link against a library without 'lib' prefix, i.e. it requires @var{hardcode_direct} to be @samp{yes}. @end defvar Index: libtool/libltdl/COPYING.LIB diff -c libtool/libltdl/COPYING.LIB:1.1.2.1 libtool/libltdl/COPYING.LIB:1.1.2.2 *** libtool/libltdl/COPYING.LIB:1.1.2.1 Sat Mar 27 08:54:40 1999 --- libtool/libltdl/COPYING.LIB Tue Nov 2 04:36:23 1999 *************** *** 1,112 **** - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 ! Copyright (C) 1991 Free Software Foundation, Inc. ! 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ! [This is the first released version of the library GPL. It is ! numbered 2 because it goes with version 2 of the ordinary GPL.] ! Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. ! This license, the Library General Public License, applies to some ! specially designated Free Software Foundation software, and to any ! other libraries whose authors decide to use it. You can use it for ! your libraries, too. ! ! When we speak of free software, we are referring to freedom, not ! price. Our General Public Licenses are designed to make sure that you ! have the freedom to distribute copies of free software (and charge for ! this service if you wish), that you receive source code or can get it ! if you want it, that you can change the software or use pieces of it ! in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid ! anyone to deny you these rights or to ask you to surrender the rights. ! These restrictions translate to certain responsibilities for you if ! you distribute copies of the library, or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source ! code. If you link a program with the library, you must provide ! complete object files to the recipients so that they can relink them ! with the library, after making changes to the library and recompiling it. And you must show them these terms so they know their rights. ! Our method of protecting your rights has two steps: (1) copyright ! the library, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the library. ! Also, for each distributor's protection, we want to make certain ! that everyone understands that there is no warranty for this free ! library. If the library is modified by someone else and passed on, we ! want its recipients to know that what they have is not the original ! version, so that any problems introduced by others will not reflect on ! the original authors' reputations. ! ! Finally, any free program is threatened constantly by software ! patents. We wish to avoid the danger that companies distributing free ! software will individually obtain patent licenses, thus in effect ! transforming the program into proprietary software. To prevent this, ! we have made it clear that any patent must be licensed for everyone's ! free use or not licensed at all. ! ! Most GNU software, including some libraries, is covered by the ordinary ! GNU General Public License, which was designed for utility programs. This ! license, the GNU Library General Public License, applies to certain ! designated libraries. This license is quite different from the ordinary ! one; be sure to read it in full, and don't assume that anything in it is ! the same as in the ordinary license. ! ! The reason we have a separate public license for some libraries is that ! they blur the distinction we usually make between modifying or adding to a ! program and simply using it. Linking a program with a library, without ! changing the library, is in some sense simply using the library, and is ! analogous to running a utility program or application program. However, in ! a textual and legal sense, the linked executable is a combined work, a ! derivative of the original library, and the ordinary General Public License ! treats it as such. ! ! Because of this blurred distinction, using the ordinary General ! Public License for libraries did not effectively promote software ! sharing, because most developers did not use the libraries. We ! concluded that weaker conditions might promote sharing better. ! ! However, unrestricted linking of non-free programs would deprive the ! users of those programs of all benefit from the free status of the ! libraries themselves. This Library General Public License is intended to ! permit developers of non-free programs to use free libraries, while ! preserving your freedom as a user of such programs to change the free ! libraries that are incorporated in them. (We have not seen how to achieve ! this as regards changes in header files, but we have achieved it as regards ! changes in the actual functions of the Library.) The hope is that this ! will lead to faster development of free libraries. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The ! former contains code derived from the library, while the latter only ! works together with the library. ! ! Note that it is possible for a library to be covered by the ordinary ! General Public License rather than by this special one. ! ! GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ! 0. This License Agreement applies to any software library which ! contains a notice placed by the copyright holder or other authorized ! party saying it may be distributed under the terms of this Library ! General Public License (also called "this License"). Each licensee is ! addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs --- 1,128 ---- ! GNU LESSER GENERAL PUBLIC LICENSE ! Version 2.1, February 1999 ! ! Copyright (C) 1991, 1999 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ! [This is the first released version of the Lesser GPL. It also counts ! as the successor of the GNU Library Public License, version 2, hence ! the version number 2.1.] ! Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. ! This license, the Lesser General Public License, applies to some ! specially designated software packages--typically libraries--of the ! Free Software Foundation and other authors who decide to use it. You ! can use it too, but we suggest you first think carefully about whether ! this license or the ordinary General Public License is the better ! strategy to use in any particular case, based on the explanations ! below. ! ! When we speak of free software, we are referring to freedom of use, ! not price. Our General Public Licenses are designed to make sure that ! you have the freedom to distribute copies of free software (and charge ! for this service if you wish); that you receive source code or can get ! it if you want it; that you can change the software and use pieces of ! it in new free programs; and that you are informed that you can do ! these things. To protect your rights, we need to make restrictions that forbid ! distributors to deny you these rights or to ask you to surrender these ! rights. These restrictions translate to certain responsibilities for ! you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source ! code. If you link other code with the library, you must provide ! complete object files to the recipients, so that they can relink them ! with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. ! We protect your rights with a two-step method: (1) we copyright the ! library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. ! To protect each distributor, we want to make it very clear that ! there is no warranty for the free library. Also, if the library is ! modified by someone else and passed on, the recipients should know ! that what they have is not the original version, so that the original ! author's reputation will not be affected by problems that might be ! introduced by others. ! ^L ! Finally, software patents pose a constant threat to the existence of ! any free program. We wish to make sure that a company cannot ! effectively restrict the users of a free program by obtaining a ! restrictive license from a patent holder. Therefore, we insist that ! any patent license obtained for a version of the library must be ! consistent with the full freedom of use specified in this license. ! ! Most GNU software, including some libraries, is covered by the ! ordinary GNU General Public License. This license, the GNU Lesser ! General Public License, applies to certain designated libraries, and ! is quite different from the ordinary General Public License. We use ! this license for certain libraries in order to permit linking those ! libraries into non-free programs. ! ! When a program is linked with a library, whether statically or using ! a shared library, the combination of the two is legally speaking a ! combined work, a derivative of the original library. The ordinary ! General Public License therefore permits such linking only if the ! entire combination fits its criteria of freedom. The Lesser General ! Public License permits more lax criteria for linking other code with ! the library. ! ! We call this license the "Lesser" General Public License because it ! does Less to protect the user's freedom than the ordinary General ! Public License. It also provides other free software developers Less ! of an advantage over competing non-free programs. These disadvantages ! are the reason we use the ordinary General Public License for many ! libraries. However, the Lesser license provides advantages in certain ! special circumstances. ! ! For example, on rare occasions, there may be a special need to ! encourage the widest possible use of a certain library, so that it ! becomes ! a de-facto standard. To achieve this, non-free programs must be ! allowed to use the library. A more frequent case is that a free ! library does the same job as widely used non-free libraries. In this ! case, there is little to gain by limiting the free library to free ! software only, so we use the Lesser General Public License. ! ! In other cases, permission to use a particular library in non-free ! programs enables a greater number of people to use a large body of ! free software. For example, permission to use the GNU C Library in ! non-free programs enables many more people to use the whole GNU ! operating system, as well as its variant, the GNU/Linux operating ! system. ! ! Although the Lesser General Public License is Less protective of the ! users' freedom, it does ensure that the user of a program that is ! linked with the Library has the freedom and the wherewithal to run ! that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The ! former contains code derived from the library, whereas the latter must ! be combined with the library in order to run. ! ^L ! GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ! 0. This License Agreement applies to any software library or other ! program which contains a notice placed by the copyright holder or ! other authorized party saying it may be distributed under the terms of ! this Lesser General Public License (also called "this License"). ! Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs *************** *** 123,129 **** "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated ! interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not --- 139,146 ---- "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated ! interface definition files, plus the scripts used to control ! compilation and installation of the library. Activities other than copying, distribution and modification are not *************** *** 133,139 **** on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. ! 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an --- 150,156 ---- on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. ! 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an *************** *** 203,209 **** ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. ! Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. --- 220,226 ---- ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. ! ^L Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. *************** *** 254,261 **** distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. ! ! 6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit --- 271,278 ---- distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. ! ^L ! 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit *************** *** 281,304 **** that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) ! b) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. ! c) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. ! d) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, ! the source code distributed need not include anything that is normally ! distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. --- 298,329 ---- that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. ! c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. ! d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. ! e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, ! the materials to be distributed need not include anything that is ! normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. *************** *** 308,314 **** accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. ! 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined --- 333,339 ---- accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. ! ^L 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined *************** *** 347,355 **** original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. ! You are not responsible for enforcing compliance by third parties to this License. ! 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or --- 372,380 ---- original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. ! You are not responsible for enforcing compliance by third parties with this License. ! ^L 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or *************** *** 363,371 **** the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. ! If any portion of this section is held invalid or unenforceable under any ! particular circumstance, the balance of the section is intended to apply, ! and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any --- 388,397 ---- the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. ! If any portion of this section is held invalid or unenforceable under ! any particular circumstance, the balance of the section is intended to ! apply, and the section as a whole is intended to apply in other ! circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any *************** *** 383,396 **** 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the ! original copyright holder who places the Library under this License may add ! an explicit geographical distribution limitation excluding those countries, ! so that distribution is permitted only in or among countries not thus ! excluded. In such case, this License incorporates the limitation as if ! written in the body of this License. 13. The Free Software Foundation may publish revised and/or new ! versions of the Library General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. --- 409,422 ---- 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the ! original copyright holder who places the Library under this License ! may add an explicit geographical distribution limitation excluding those ! countries, so that distribution is permitted only in or among ! countries not thus excluded. In such case, this License incorporates ! the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new ! versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. *************** *** 401,407 **** the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. ! 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is --- 427,433 ---- the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. ! ^L 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is *************** *** 411,417 **** of all derivatives of our free software and of promoting the sharing and reuse of software generally. ! NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. --- 437,443 ---- of all derivatives of our free software and of promoting the sharing and reuse of software generally. ! NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. *************** *** 434,481 **** SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ! END OF TERMS AND CONDITIONS ! ! Appendix: How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting ! redistribution under these terms (or, alternatively, under the terms of the ! ordinary General Public License). ! To apply these terms, attach the following notices to the library. It is ! safest to attach them to the start of each source file to most effectively ! convey the exclusion of warranty; and each file should have at least the ! "copyright" line and a pointer to where the full notice is found. ! Copyright (C) This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! Library General Public License for more details. ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! Also add information on how to contact you by electronic and paper mail. ! You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the ! library `Frob' (a library for tweaking knobs) written by James Random Hacker. , 1 April 1990 Ty Coon, President of Vice That's all there is to it! --- 460,515 ---- SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ! END OF TERMS AND CONDITIONS ! ^L ! How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting ! redistribution under these terms (or, alternatively, under the terms ! of the ordinary General Public License). ! To apply these terms, attach the following notices to the library. ! It is safest to attach them to the start of each source file to most ! effectively convey the exclusion of warranty; and each file should ! have at least the "copyright" line and a pointer to where the full ! notice is found. ! ! Copyright (C) This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! Lesser General Public License for more details. ! You should have received a copy of the GNU Lesser General Public ! License along with this library; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Also add information on how to contact you by electronic and paper ! mail. ! You should also get your employer (if you work as a programmer) or ! your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the ! library `Frob' (a library for tweaking knobs) written by James ! Random Hacker. , 1 April 1990 Ty Coon, President of Vice That's all there is to it! + + Index: libtool/libltdl/Makefile.am diff -c libtool/libltdl/Makefile.am:1.27.2.4 libtool/libltdl/Makefile.am:1.27.2.5 *** libtool/libltdl/Makefile.am:1.27.2.4 Tue May 25 09:07:40 1999 --- libtool/libltdl/Makefile.am Tue Nov 2 04:36:23 1999 *************** *** 14,20 **** endif libltdl_la_SOURCES = ltdl.c ! libltdl_la_LDFLAGS = -version-info 1:1:1 libltdl_la_LIBADD = $(LIBADD_DL) libltdlc_la_SOURCES = ltdl.c --- 14,20 ---- endif libltdl_la_SOURCES = ltdl.c ! libltdl_la_LDFLAGS = -version-info 1:2:1 libltdl_la_LIBADD = $(LIBADD_DL) libltdlc_la_SOURCES = ltdl.c *************** *** 29,44 **** ## This allows us to install libltdl without using ln and without creating ## a world writeable directory. ! ## FIXME: Removed this rule once automake can do this properly by itself. local-install-files: $(DISTFILES) -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ else \ test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ ! || cp -p $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ fi; \ done --- 29,44 ---- ## This allows us to install libltdl without using ln and without creating ## a world writeable directory. ! ## FIXME: Remove this rule once automake can do this properly by itself. local-install-files: $(DISTFILES) -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ else \ test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ ! || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ fi; \ done Index: libtool/libltdl/README diff -c libtool/libltdl/README:1.1 libtool/libltdl/README:1.1.4.1 *** libtool/libltdl/README:1.1 Tue Nov 17 23:29:29 1998 --- libtool/libltdl/README Tue Nov 2 04:36:23 1999 *************** *** 1 **** --- 1,9 ---- This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. + + It supports the following dlopen interfaces: + * dlopen (Solaris, Linux and various BSD flavors) + * shl_load (HP-UX) + * LoadLibrary (Win16 and Win32) + * load_add_on (BeOS) + * GNU DLD (emulates dynamic linking for static libraries) + * libtool's dlpreopen Index: libtool/libltdl/ltdl.c diff -c libtool/libltdl/ltdl.c:1.64.2.16 libtool/libltdl/ltdl.c:1.64.2.18 *** libtool/libltdl/ltdl.c:1.64.2.16 Thu Jul 1 07:48:44 1999 --- libtool/libltdl/ltdl.c Tue Nov 2 04:36:23 1999 *************** *** 19,26 **** Library General Public License for more details. You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define _LTDL_COMPILE_ --- 19,27 ---- Library General Public License for more details. You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ! 02111-1307 USA */ #define _LTDL_COMPILE_ *************** *** 1366,1372 **** handle->deplibs = 0; newhandle = handle; if (tryall_dlopen(&newhandle, filename) ! && (!dir || (!find_file(basename, user_search_path, 0, &newhandle) && !find_file(basename, --- 1367,1373 ---- handle->deplibs = 0; newhandle = handle; if (tryall_dlopen(&newhandle, filename) ! && (dir || (!find_file(basename, user_search_path, 0, &newhandle) && !find_file(basename, *************** *** 1529,1534 **** --- 1530,1537 ---- return 0; } if (handle->name) { + const char *saved_error = last_error; + /* this is a libtool module */ if (handle->type->sym_prefix) { strcpy(sym, handle->type->sym_prefix); *************** *** 1544,1549 **** --- 1547,1553 ---- lt_dlfree(sym); return address; } + last_error = saved_error; } /* otherwise try "symbol" */ if (handle->type->sym_prefix) { Index: libtool/libltdl/ltdl.h diff -c libtool/libltdl/ltdl.h:1.19.2.4 libtool/libltdl/ltdl.h:1.19.2.5 *** libtool/libltdl/ltdl.h:1.19.2.4 Thu Jul 1 07:48:44 1999 --- libtool/libltdl/ltdl.h Tue Nov 2 04:36:23 1999 *************** *** 20,26 **** You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Only include this header file once. */ --- 20,27 ---- You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free ! Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ! 02111-1307 USA */ /* Only include this header file once. */ Index: libtool/tests/noinst-link.test diff -c libtool/tests/noinst-link.test:1.1.2.1 libtool/tests/noinst-link.test:1.1.2.2 *** libtool/tests/noinst-link.test:1.1.2.1 Fri Mar 19 08:54:18 1999 --- libtool/tests/noinst-link.test Tue Nov 2 04:36:23 1999 *************** *** 12,22 **** . $srcdir/defs || exit 1 # Check that things are built. ! if test -f $prefix/lib/libhello.la && cd ../demo; then : else echo "You must run demo-inst.test before $0" 1>&2 exit 77 fi echo "removing libhello.la and hell from ../demo" rm -f libhello.la hell --- 12,25 ---- . $srcdir/defs || exit 1 # Check that things are built. ! if test -f $prefix/lib/libhello.la; then : else echo "You must run demo-inst.test before $0" 1>&2 exit 77 fi + + # Change to our build directory. + cd ../demo || exit 77 echo "removing libhello.la and hell from ../demo" rm -f libhello.la hell