diff -druN libtool-1.3/AUTHORS libtool-1.3.2/AUTHORS --- libtool-1.3/AUTHORS Fri Nov 27 13:17:20 1998 +++ libtool-1.3.2/AUTHORS Tue May 25 11:14:43 1999 @@ -5,4 +5,4 @@ Gordon Matzigkeit. Designed and implemented libtool. Alexandre Oliva . Co-maintainer. Thomas Tanner . Co-maintainer. -Gary V. Vaughan . Co-maintainer. \ No newline at end of file +Gary V. Vaughan . Co-maintainer. diff -druN libtool-1.3/ChangeLog libtool-1.3.2/ChangeLog --- libtool-1.3/ChangeLog Thu Apr 29 10:07:13 1999 +++ libtool-1.3.2/ChangeLog Tue May 25 21:28:32 1999 @@ -1,5 +1,188 @@ +1999-05-25 Alexandre Oliva + + * configure.in: Bumped to 1.3.2. + + * NEWS: List fixed problems. + * doc/PLATFORMS: Tested for 1.3.2. + + * config.guess: Synch with GNU common. + + * ltmain.in: Revert to stripping .exe on all platforms. + * TODO: Note about this problem. Demo is fixed on win32. -Wl and + -Wc are implemented for release 1.4. Support `empty' convenience + libraries. + + * ltconfig.in (solaris*, ld_shlibs): Do not enable shared + libraries with GNU ld 2.8.*, it's broken. Emit a warning + suggesting an upgrade. + Reported by Brian Ford and Ronald Pijnacker + + +1999-05-25 Frank Ch. Eigler + + * ltmain.in: file_magic check would not avoid cyclic links. + +1999-05-25 Alexandre Oliva + + * ltmain.in: Remove object files before writing to them, to avoid + circular links. + Reported by Ron O'Hara + +1999-05-24 Thomas Tanner + + * doc/libtool.texi: fix "wierd" typo :) + * ltmain.in: strip off the .exe suffix only on *Win + Reported by Matthew D. Langston + +1999-05-23 Alexandre Oliva + + * doc/PLATFORMS: Release 1.3.1 passes on GNU Hurd/x86. + Reported by Pavel Roskin + +1999-05-22 Doug Evans + + * libltdl/configure.in (dlerror): Fix typo in dlopen found in -ldl + test. + +1999-05-22 Gary V. Vaughan + + * configure.in: bumped to 1.3.1a. + +1999-05-21 Gary V. Vaughan + + GNU Libtool 1.3.1 was released. + + * AUTHORS: Added myself back into the file! Seems I + managed to delete myself somehow :-? + + * AUTHORS: de CR/LFed. + * config.guess: ditto. + * config.sub: ditto. + + * configure.in: bumped to revision 1.3.1. + * NEWS: insert todays date alongside 1.3.1 release. + * Makefile.in: use gnu not gnits rules + * config.guess: synch with gnu common & apply Takabatake-san's + MIPS *000 patch. + * config.sub: synch with gnu common. + +1999-05-21 Pavel Roskin + + * Makefile.am (EXTRA_DIST): Don't distribute instutils. + (install-data-hook): use libltdl/Makefile.am's local-install files + rule. + * libltdl/Makefile.am (local-install-files): New rule to install + libltdl without creating links or mode 777 directories. + * instutil/*: deleted. + +1999-05-21 Alexandre Oliva + + * doc/PLATFORMS: Updated to 1.3.1 for all platforms I've got. + Added sparc-unknown-linux-gnu. + +1999-05-21 Gary V. Vaughan + + * demo/foo.h: s/PARAMS/LTDL_PARAMS/g + * libltdl/ltdl.h: ditto. + * libltdl/ltdl.c: ditto. + + * demo/foo.h: s/__P/PARAMS/g + * libltdl/ltdl.h: ditto. + * libltdl/ltdl.c: ditto. + Reported by Akim Demaille + +1999-05-20 Alexandre Oliva + + * NEWS: Updated docs. + * TODO: Recommend libtool.m4 to be inserted in acinclude.m4. AIX + 4.3.2.0 no longer fails on static dlopening. GNU DLD no longer + has to support .la files, since libltdl already does. Convenience + libraries and reloadable objects should be tested in the + testsuite. We could support some amount of control on the soname + of libraries. + * doc/libtool.texi: Notes about convenience libraries and + automake. Documented INCLTDL. + +1999-05-20 Thomas Tanner + + * cdemo/main.c: "Welcome _to_ ..." + * mdemo/main.c: ditto + * libltdl/configure.in: support multiple dlopening mechanisms + at once + * libltdl/ltdl.c: prefix system dependent functions with "sys_" + to avoid symbol conflicts (libdld didn't work) + * libtool.m4 (AC_LIBLTDL_*): set INCLTDL to the path of ltdl.h + * ltconfig.in: check for dlopen with -ldl first + +1999-05-19 Gary V. Vaughan + + * NEWS: Added 1.3.1 news items. + * doc/PLATFORMS: updated the boxes I have access to, to 1.3.1 + in preparation for the next release. + +1999-05-18 Gary V. Vaughan + + * ltconfig.in (cygwin*, whole_archive_flag_spec): dlltool chokes + on this, so leave it unset in this case so that the ltmain code + knows it has to unpack convenience archives by itself. + +1999-05-17 Gary V. Vaughan + + * ltmain.in: Do not exit when an unknown library name is passed + passed in, simply warn and continue since some compilers require + -LANG:* like options to work. + Reported by Adam C. Powell, IV + +1999-05-17 Jiro Takabatake + + * ltconfig.in: port to NEC UX/4800. + * NEWS: updated. + +1999-05-17 Gary V. Vaughan + + * ltconfig.in (beos*, deplibs_check_method): set to pass_all. BeOS + is PIC by default. + Reported by "Shawn T . Amundson" + + * libltdl/configure.in: Fix test failures on AIX 4.3.2 by checking + for dlopen *with* -ldl first. + Reported by Greg Wooledge + + * demo/foo.h: Don't set any declspecs until we have full dll + support. + +1999-05-16 Alexandre Oliva + + * ltconfig.in (solaris2.6, whole_archive_flag_spec): Do not use + -Wl for allextract. + +1999-05-14 Alexandre Oliva + + * instutil/chmod: New script to avoid chmod'ing files while + installing libltdl's sources. + * instutil/ln: New script to avoid hard-linking libltdl's sources + in the install tree. + * Makefile.am (EXTRA_DIST): Dist them. + (instal-data-hook): Add srcdir/instutil to the beginning of the + PATH before installing libltdl's sources. + +1999-05-06 Gary V. Vaughan + + * Makefile.am (install-data-hook): make sure the install directory + is not left world writable. + Reported by Andreas Schwab + +1999-04-30 Alexandre Oliva + + * libtool.m4: Use ifelse instead of if. + Reported by David Mazieres + + * configure.in: Bumped to 1.3.0a, just in case. + 1999-04-29 Alexandre Oliva + GNU Libtool 1.3 was released. + * configure.in: Bumped to 1.3. * NEWS: Summarize news since 1.2. @@ -630,4 +813,4 @@ Continued in ChangeLog.0 - $Revision: 1.385.2.117 $ $Date: 1999/04/29 13:07:13 $ + $Revision: 1.385.2.150 $ $Date: 1999/05/26 00:28:32 $ diff -druN libtool-1.3/Makefile.am libtool-1.3.2/Makefile.am --- libtool-1.3/Makefile.am Sun Apr 25 16:05:55 1999 +++ libtool-1.3.2/Makefile.am Fri May 21 11:26:34 1999 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = 1.3e gnits readme-alpha +AUTOMAKE_OPTIONS = 1.3e gnu BUILD_SUBDIRS = . libltdl doc tests SUBDIRS = $(BUILD_SUBDIRS) @@ -101,7 +101,7 @@ # Create and install libltdl install-data-hook: - cd libltdl && $(MAKE) distdir distdir=$(DESTDIR)$(pkgdatadir)/libltdl + cd libltdl && $(MAKE) local-install-files # Uninstall libltdl uninstall-local: diff -druN libtool-1.3/Makefile.in libtool-1.3.2/Makefile.in --- libtool-1.3/Makefile.in Thu Apr 29 10:33:31 1999 +++ libtool-1.3.2/Makefile.in Tue May 25 21:32:31 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -60,8 +60,6 @@ host_alias = @host_alias@ host_triplet = @host@ ACINCLUDE_M4_LIST = @ACINCLUDE_M4_LIST@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ AWK = @AWK@ CC = @CC@ @@ -81,8 +79,7 @@ aclocaldir = @aclocaldir@ pkgdatadir = @pkgdatadir@ - -AUTOMAKE_OPTIONS = 1.3e gnits readme-alpha +AUTOMAKE_OPTIONS = 1.3e gnu BUILD_SUBDIRS = . libltdl doc tests SUBDIRS = $(BUILD_SUBDIRS) @@ -96,8 +93,7 @@ aclocal_macros = libtool.m4 -EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in \ - mkstamp ChangeLog.0 +EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in mkstamp ChangeLog.0 CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT @@ -115,28 +111,27 @@ TSDEPS = TSDEPS_DIST = ChangeLog libtool.m4 CVS = cvs # set it to `:' to avoid CVS operations -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) -DIST_SOURCES = DATA = $(aclocal_DATA) $(pkgdata_DATA) -DIST_COMMON = README $(aclocal_DATA) $(pkgdata_DATA) AUTHORS COPYING \ -ChangeLog INSTALL Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 \ -aclocal.m4 config.guess config.sub configure configure.in install-sh \ -ltconfig ltmain.sh missing mkinstalldirs +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ +Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \ +config.sub configure configure.in install-sh ltconfig ltmain.sh missing \ +mkinstalldirs -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ @@ -154,80 +149,76 @@ @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ done uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + list='$(bin_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$f; \ - else :; fi; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ done uninstall-pkgdataSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ - rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ + list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ done install-aclocalDATA: $(aclocal_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(aclocaldir) @list='$(aclocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(aclocaldir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(aclocaldir)/$$f; \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p; \ + fi; fi; \ done uninstall-aclocalDATA: @$(NORMAL_UNINSTALL) - @list='$(aclocal_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(aclocaldir)/$$f"; \ - rm -f $(DESTDIR)$(aclocaldir)/$$f; \ + list='$(aclocal_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(aclocaldir)/$$p; \ done install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @list='$(pkgdata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ + fi; fi; \ done uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ - rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ + list='$(pkgdata_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd @@ -266,7 +257,7 @@ dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ @@ -327,7 +318,7 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ @@ -347,24 +338,20 @@ echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) - @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ - echo "NEWS not updated; not releasing" 1>&2; \ - exit 1; \ - fi -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -381,6 +368,7 @@ || exit 1; \ fi; \ done + info-am: info: info-recursive dvi-am: @@ -408,7 +396,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) all-redirect: all-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) \ @@ -448,20 +436,19 @@ .PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataSCRIPTS \ install-pkgdataSCRIPTS uninstall-aclocalDATA install-aclocalDATA \ -uninstall-pkgdataDATA install-pkgdataDATA install-recursive \ -uninstall-recursive install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +uninstall-pkgdataDATA install-pkgdataDATA install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ install-exec install-data-am install-data install-am install \ uninstall-local uninstall-am uninstall all-redirect all-am all \ -install-strip installdirs-am installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +installdirs-am installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig @@ -532,7 +519,7 @@ # Create and install libltdl install-data-hook: - cd libltdl && $(MAKE) distdir distdir=$(DESTDIR)$(pkgdatadir)/libltdl + cd libltdl && $(MAKE) local-install-files # Uninstall libltdl uninstall-local: diff -druN libtool-1.3/NEWS libtool-1.3.2/NEWS --- libtool-1.3/NEWS Thu Apr 29 09:47:37 1999 +++ libtool-1.3.2/NEWS Tue May 25 21:10:23 1999 @@ -1,5 +1,22 @@ NEWS - list of user-visible changes between releases of GNU Libtool +New in 1.3.2: 1999-05-26, CVS version 1.3.1a, Libtool team: +* Avoid circular links of objects and libraries. +* Look for dlerror when dlopen was found in -ldl (typo). +* Disable shared libraries with broken GNU ld on Solaris. + +New in 1.3.1: 1999-05-21, CVS version 1.3.0a, Libtool team: +* Documentation improvements; recommend automake users to insert libtool.m4 + in acinclude.m4 +* AC_LIBLTDL_CONVENIENCE and AC_LIBLTDL_INSTALLABLE now set INCLTDL. +* New port to NEC UX/4800. +* cygwin-b20.1 passes all tests. +* Slightly improved BeOS support. +* Many AIX 4.3.2 test failures have gone. +* Pass unknown -L arguments through to the linker (for -LANG:* support). +* Close a security hole with mode 777 directory during libltdl installation. +* Fixed the infamous ``ifelse'' bug in libtool.m4 + New in 1.3: 1999-04-29, Libtool team: * This is just a summary of the changes since 1.2. See the news of intermediate alpha releases below for details. diff -druN libtool-1.3/TODO libtool-1.3.2/TODO --- libtool-1.3/TODO Thu Apr 29 06:58:40 1999 +++ libtool-1.3.2/TODO Tue May 25 20:49:37 1999 @@ -1,8 +1,9 @@ In the near future: ******************** -* check whether the version of libtool.m4 is compatible -with ltconfig/ltmain.sh +* Check whether the version of libtool.m4 is compatible with +ltconfig/ltmain.sh. Meanwhile, the recommended approach for +developers using automake is to insert libtool.m4 in acinclude.m4. * Inter-library dependencies should be fully tracked by libtool and need to work for ltlibraries too. This requires looking up installed @@ -37,8 +38,10 @@ possible would greatly improve libltdl's ability to be embedded in and used by other systems. -* Fix */demo on win32. -This may require resolving some of the items below. +* Arrange that EXEEXT suffixes are stripped from wrapper script names +only when needed, and that a timestamp file or a wrapper program is +created with the EXEEXT suffix, so that `make' doesn't build it every +time. * Figure out how to use data items in dlls with win32. The difficult part is compiling each object which will be linked with an @@ -76,11 +79,10 @@ is `-Wl,', or stripping the `-Wl,' part if we're calling `ld' directly. We could also introduce `-Wc,flag' and `-Xcompiler flag' to allow unrecognized flags to be passed to the compiler, after stripping -by libtool. +by libtool. This is already implemented in the CVS tree. -* Another form of convenience library, suggested by Alexandre Oliva, -is to have undocumented utility libraries, where only the shared -version is installed. +* Another form of convenience library is to have undocumented utility +libraries, where only the shared version is installed. * We could use libtool object convenience libraries that resolve symbols to be included in a libtool archive. This would require some @@ -89,25 +91,36 @@ * Currently, convenience libraries (.al) are built from .lo objects, except when --disable-shared. When we can build both shared and static libraries, we should probably create a .al out of .lo objects -and also a .a out of .o objects. The .al would only be used to -create shared libraries, whereas the .a would be used for creating -static libraries and programs. +and also a .a out of .o objects. The .al would only be used to create +shared libraries, whereas the .a would be used for creating static +libraries and programs. We could also explicitly support `empty' +convenience libraries, that behave as macros that expand to a set of +-Rs, -Ls and -ls switches. + +* We should include tests with convenience libraries and reloadable +objects in the testsuite. * Try to find a work-around for -[all-]static and libltdl on platforms -that will fail to find dlopening functions in this case, such as AIX -4.3.2.0. Maybe creating an alternate libltdl that provides only for -dlpreopening, or creating an additional static library to provide -dummy implementations of the functions that can't be linked -statically. This could hardly be made completely transparent, though. +that will fail to find dlopening functions in this case. Maybe +creating an alternate libltdl that provides only for dlpreopening, or +creating an additional static library to provide dummy implementations +of the functions that can't be linked statically. This could hardly +be made completely transparent, though. * Need to finalize the documentation, and give a specification of -`.la' files so that people can depend on their format. This also -needs to be done so that DLD uses a public interface to libtool -archives. This would be a good thing to put before the maintainance -notes. +`.la' files so that people can depend on their format. This would be +a good thing to put before the maintainance notes. * Filenames containing shell meta-characters are not properly handled by libtool. Compiling a file named "a;b.c", for example, fails. + +* We could introduce a mechanism to allow for soname rewriting, to +ease multi-libc support. Installers could specify a prefix, suffix or +sed command to modify the soname, and libtool would create the +corresponding link. This would allow for rebuilding a library with +the same version number, but depending on different versions of libc, +for example. In the future, we might even have an option to encode +the sonames of all dependencies of a library into its soname. Things to think about: ********************** diff -druN libtool-1.3/acinclude.m4 libtool-1.3.2/acinclude.m4 --- libtool-1.3/acinclude.m4 Thu Apr 29 05:13:34 1999 +++ libtool-1.3.2/acinclude.m4 Thu May 20 20:33:02 1999 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,5 +423,5 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff -druN libtool-1.3/aclocal.m4 libtool-1.3.2/aclocal.m4 --- libtool-1.3/aclocal.m4 Thu Apr 29 10:28:26 1999 +++ libtool-1.3.2/aclocal.m4 Tue May 25 21:31:07 1999 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl PARTICULAR PURPOSE. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -372,6 +372,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -395,9 +396,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -410,8 +413,8 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -424,8 +427,6 @@ AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -446,19 +447,6 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -dnl We check for tar when the user configures the end package. -dnl This is sad, since we only need this for "dist". However, -dnl there's no other good way to do it. We prefer GNU tar if -dnl we can find it. If we can't find a tar, it doesn't really matter. -AC_CHECK_PROGS(AMTAR, gnutar gtar tar) -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - dnl We have GNU tar. - AMTARFLAGS=o - fi -fi -AC_SUBST(AMTARFLAGS) AC_REQUIRE([AC_PROG_MAKE_SET])]) # diff -druN libtool-1.3/cdemo/Makefile.in libtool-1.3.2/cdemo/Makefile.in --- libtool-1.3/cdemo/Makefile.in Thu Apr 29 10:28:38 1999 +++ libtool-1.3.2/cdemo/Makefile.in Tue May 25 21:31:16 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -59,8 +59,6 @@ POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ CC = @CC@ DLLTOOL = @DLLTOOL@ @@ -77,7 +75,6 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ - AUTOMAKE_OPTIONS = no-dependencies foreign EXTRA_DIST = acinclude.m4 @@ -93,7 +90,6 @@ cdemo_SOURCES = main.c cdemo_LDADD = libfoo.la -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_CLEAN_FILES = @@ -106,36 +102,34 @@ LIBS = @LIBS@ libfoo_la_LDFLAGS = libfoo_la_DEPENDENCIES = -am_libfoo_la_OBJECTS = foo.lo -libfoo_la_OBJECTS = $(am_libfoo_la_OBJECTS) +libfoo_la_OBJECTS = foo.lo bin_PROGRAMS = cdemo$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_cdemo_OBJECTS = main.o -cdemo_OBJECTS = $(am_cdemo_OBJECTS) +cdemo_OBJECTS = main.o cdemo_DEPENDENCIES = libfoo.la cdemo_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libfoo_la_SOURCES) $(cdemo_SOURCES) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) -DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in \ -acinclude.m4 aclocal.m4 configure configure.in +DIST_COMMON = README Makefile.am Makefile.in acinclude.m4 aclocal.m4 \ +configure configure.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best SOURCES = $(libfoo_la_SOURCES) $(cdemo_SOURCES) -OBJECTS = $(am_libfoo_la_OBJECTS) $(am_cdemo_OBJECTS) +OBJECTS = $(libfoo_la_OBJECTS) $(cdemo_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .c .lo .o +.SUFFIXES: .S .c .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile @@ -163,6 +157,12 @@ .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: -rm -f *.o core *.core @@ -174,7 +174,13 @@ maintainer-clean-compile: .c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c -o $@ $< + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo @@ -185,7 +191,6 @@ distclean-libtool: maintainer-clean-libtool: -foo.lo: libfoo.la: $(libfoo_la_OBJECTS) $(libfoo_la_DEPENDENCIES) $(LINK) $(libfoo_la_LDFLAGS) $(libfoo_la_OBJECTS) $(libfoo_la_LIBADD) $(LIBS) @@ -204,20 +209,16 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -main.o: cdemo$(EXEEXT): $(cdemo_OBJECTS) $(cdemo_DEPENDENCIES) @rm -f cdemo$(EXEEXT) @@ -260,7 +261,7 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ @@ -280,11 +281,11 @@ echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) @@ -293,7 +294,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -322,7 +323,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -376,8 +377,8 @@ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all install-strip \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -druN libtool-1.3/cdemo/acinclude.m4 libtool-1.3.2/cdemo/acinclude.m4 --- libtool-1.3/cdemo/acinclude.m4 Thu Apr 29 10:28:36 1999 +++ libtool-1.3.2/cdemo/acinclude.m4 Thu May 20 20:33:27 1999 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,5 +423,5 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff -druN libtool-1.3/cdemo/aclocal.m4 libtool-1.3.2/cdemo/aclocal.m4 --- libtool-1.3/cdemo/aclocal.m4 Thu Apr 29 10:28:36 1999 +++ libtool-1.3.2/cdemo/aclocal.m4 Tue May 25 21:31:15 1999 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl PARTICULAR PURPOSE. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -372,6 +372,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -395,9 +396,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -410,8 +413,8 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -424,8 +427,6 @@ AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -446,19 +447,6 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -dnl We check for tar when the user configures the end package. -dnl This is sad, since we only need this for "dist". However, -dnl there's no other good way to do it. We prefer GNU tar if -dnl we can find it. If we can't find a tar, it doesn't really matter. -AC_CHECK_PROGS(AMTAR, gnutar gtar tar) -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - dnl We have GNU tar. - AMTARFLAGS=o - fi -fi -AC_SUBST(AMTARFLAGS) AC_REQUIRE([AC_PROG_MAKE_SET])]) # diff -druN libtool-1.3/cdemo/configure libtool-1.3.2/cdemo/configure --- libtool-1.3/cdemo/configure Thu Apr 29 10:28:38 1999 +++ libtool-1.3.2/cdemo/configure Tue May 25 21:31:16 1999 @@ -699,7 +699,6 @@ fi - PACKAGE=cdemo VERSION=0.1 @@ -719,7 +718,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:723: checking for working aclocal" >&5 +echo "configure:722: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -732,7 +731,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:736: checking for working autoconf" >&5 +echo "configure:735: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -745,7 +744,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:749: checking for working automake" >&5 +echo "configure:748: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -758,7 +757,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:762: checking for working autoheader" >&5 +echo "configure:761: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -771,7 +770,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:775: checking for working makeinfo" >&5 +echo "configure:774: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -783,53 +782,12 @@ echo "$ac_t""missing" 1>&6 fi -for ac_prog in gnutar gtar tar -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:792: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AMTAR"; then - ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AMTAR="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AMTAR="$ac_cv_prog_AMTAR" -if test -n "$AMTAR"; then - echo "$ac_t""$AMTAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AMTAR" && break -done - -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - AMTARFLAGS=o - fi -fi - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:833: checking for $ac_word" >&5 +echo "configure:791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -859,7 +817,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:863: checking for $ac_word" >&5 +echo "configure:821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -910,7 +868,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:914: checking for $ac_word" >&5 +echo "configure:872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -942,7 +900,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -953,12 +911,12 @@ cat > conftest.$ac_ext << EOF -#line 957 "configure" +#line 915 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -984,12 +942,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:993: checking whether we are using GNU C" >&5 +echo "configure:951: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -998,7 +956,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1017,7 +975,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1021: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:979: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1049,12 +1007,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1053: checking for Cygwin environment" >&5 +echo "configure:1011: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1082,19 +1040,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1086: checking for mingw32 environment" >&5 +echo "configure:1044: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1113,7 +1071,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1117: checking for executable suffix" >&5 +echo "configure:1075: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1123,7 +1081,7 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1219,7 +1177,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1223: checking host system type" >&5 +echo "configure:1181: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1240,7 +1198,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1244: checking build system type" >&5 +echo "configure:1202: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1260,7 +1218,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1264: checking for $ac_word" >&5 +echo "configure:1222: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1299,7 +1257,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1303: checking for ld used by GCC" >&5 +echo "configure:1261: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1323,10 +1281,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1327: checking for GNU ld" >&5 +echo "configure:1285: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1330: checking for non-GNU ld" >&5 +echo "configure:1288: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1362,7 +1320,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1366: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1324: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1378,7 +1336,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1382: checking for BSD-compatible nm" >&5 +echo "configure:1340: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1415,7 +1373,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1419: checking whether ln -s works" >&5 +echo "configure:1377: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1459,8 +1417,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1463 "configure"' > conftest.$ac_ext - if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1421 "configure"' > conftest.$ac_ext + if { (eval echo configure:1422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1481,19 +1439,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1485: checking whether the C compiler needs -belf" >&5 +echo "configure:1443: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1597,7 +1555,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1601: checking how to run the C preprocessor" >&5 +echo "configure:1559: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1612,13 +1570,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1580: \"$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 : @@ -1629,13 +1587,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1597: \"$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 : @@ -1646,13 +1604,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1614: \"$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 : @@ -1680,17 +1638,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1684: checking for $ac_hdr" >&5 +echo "configure:1642: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1652: \"$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 rm -rf conftest* @@ -1724,7 +1682,7 @@ ;; *-ncr-sysv4.3*) echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6 -echo "configure:1728: checking for _mwvalidcheckl in -lmw" >&5 +echo "configure:1686: checking for _mwvalidcheckl in -lmw" >&5 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1732,7 +1690,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1764,7 +1722,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1768: checking for main in -lm" >&5 +echo "configure:1726: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1772,14 +1730,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1802,7 +1760,7 @@ ;; *) echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1806: checking for main in -lm" >&5 +echo "configure:1764: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1810,14 +1768,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1997,8 +1955,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g -s%@AMTAR@%$AMTAR%g -s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@EXEEXT@%$EXEEXT%g diff -druN libtool-1.3/cdemo/main.c libtool-1.3.2/cdemo/main.c --- libtool-1.3/cdemo/main.c Mon Feb 15 14:46:47 1999 +++ libtool-1.3.2/cdemo/main.c Thu May 20 18:02:42 1999 @@ -29,7 +29,7 @@ { int value; - printf ("Welcome GNU libtool cdemo!\n"); + printf ("Welcome to GNU libtool cdemo!\n"); value = hello(); printf ("hello returned: %i\n", value); diff -druN libtool-1.3/config.guess libtool-1.3.2/config.guess --- libtool-1.3/config.guess Thu Apr 29 07:43:48 1999 +++ libtool-1.3.2/config.guess Tue May 25 17:41:59 1999 @@ -1,6 +1,7 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +# Free Software Foundation, Inc. # # 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 @@ -114,7 +115,13 @@ esac fi rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 @@ -158,7 +165,7 @@ SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -414,7 +421,7 @@ case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 ) + 9000/[678][0-9][0-9]) sed 's/^ //' << EOF >$dummy.c #include #include @@ -488,7 +495,7 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE*:*:*) + *9??*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -507,6 +514,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -546,7 +556,7 @@ echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; @@ -559,12 +569,12 @@ hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; i?86:BSD/386:*:* | i?86:BSD/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; @@ -589,6 +599,15 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -622,7 +641,36 @@ 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) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + elf32ppc) + # Determine Lib Version + cat >$dummy.c < +#if defined(__GLIBC__) +extern char __libc_version[]; +extern char __libc_release[]; +#endif +main(argc, argv) + int argc; + char *argv[]; +{ +#if defined(__GLIBC__) + printf("%s %s\n", __libc_version, __libc_release); +#else + printf("unkown\n"); +#endif + return 0; +} +EOF + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then @@ -755,6 +803,14 @@ 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 UNAME_REL=`sed -n 's/.*Version //p' /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=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i?86:UnixWare:*:*) - if /bin/uname -X 2>/dev/null >/dev/null ; then - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - fi - echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} - exit 0 ;; pc:*:*:*) # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. @@ -862,7 +915,7 @@ news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else diff -druN libtool-1.3/config.sub libtool-1.3.2/config.sub --- libtool-1.3/config.sub Thu Apr 29 07:43:48 1999 +++ libtool-1.3.2/config.sub Tue May 25 13:34:53 1999 @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -98,11 +98,21 @@ os= basic_machine=$1 ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=vxworks + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -121,6 +131,9 @@ os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -152,14 +165,20 @@ 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 \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips64 | mipsel | mips64el \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + | 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' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -175,26 +194,41 @@ 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-* | i960-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67] \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ + | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* \ - | f301-* | armv*-*) + | 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. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -224,6 +258,10 @@ basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -300,6 +338,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -318,6 +360,14 @@ basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -333,13 +383,30 @@ basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -348,13 +415,13 @@ hppa-next) os=-nextstep3 ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - os=-mpeix + hppaosf) + basic_machine=hppa1.1-hp + os=-osf ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - os=-mpeix + hppro) + basic_machine=hppa1.1-hp + os=-proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm @@ -377,6 +444,22 @@ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + i386-go32 | go32) + basic_machine=i386-unknown + os=-go32 + ;; + i386-mingw32 | mingw32) + basic_machine=i386-unknown + os=-mingw32 + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -405,6 +488,10 @@ miniframe) basic_machine=m68000-convergent ;; + *mint | *MiNT) + basic_machine=m68k-atari + os=-mint + ;; mipsel*-linux*) basic_machine=mipsel-unknown os=-linux-gnu @@ -419,10 +506,22 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-unknown + os=-msdos + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; netwinder) basic_machine=armv4l-corel os=-linux @@ -439,6 +538,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -464,9 +567,25 @@ basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; np1) basic_machine=np1-gould ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -484,19 +603,19 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | nexen) + pentium | p5 | k5 | k6 | nexen) basic_machine=i586-pc ;; - pentiumpro | p6 | k6 | 6x86) + pentiumpro | p6 | 6x86) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i786-pc ;; - pentium-* | p5-* | k5-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | k6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) @@ -520,12 +639,20 @@ ps2) basic_machine=i386-ibm ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; sequent) basic_machine=i386-sequent ;; @@ -533,6 +660,10 @@ basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -540,6 +671,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -584,6 +722,10 @@ basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -601,6 +743,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -624,6 +770,14 @@ basic_machine=a29k-wrs os=-vxworks ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -631,9 +785,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; - *mint | *MiNT) - basic_machine=m68k-atari - os=-mint + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim ;; none) basic_machine=none-none @@ -642,6 +796,15 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; mips) if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown @@ -664,7 +827,7 @@ we32k) basic_machine=we32k-att ;; - sparc) + sparc | sparcv9) basic_machine=sparc-sun ;; cydra) @@ -676,6 +839,16 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -729,14 +902,21 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \ - | -openstep* | -mpeix* | -oskit*) + | -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* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -761,6 +941,9 @@ -acis*) os=-aos ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; @@ -792,6 +975,12 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; @@ -847,6 +1036,15 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -859,6 +1057,15 @@ *-ibm) os=-aix ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -922,6 +1129,15 @@ f301-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; *-atari*) os=-mint ;; @@ -946,10 +1162,10 @@ -aix*) vendor=ibm ;; - -hpux*) - vendor=hp + -beos*) + vendor=be ;; - -mpeix*) + -hpux*) vendor=hp ;; -mpeix*) @@ -980,6 +1196,12 @@ vendor=wrs ;; -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) vendor=apple ;; -*mint | -*MiNT) diff -druN libtool-1.3/configure libtool-1.3.2/configure --- libtool-1.3/configure Thu Apr 29 10:28:29 1999 +++ libtool-1.3.2/configure Tue May 25 21:31:10 1999 @@ -702,10 +702,9 @@ fi - PACKAGE=libtool -VERSION=1.3 +VERSION=1.3.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -722,7 +721,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:726: checking for working aclocal" >&5 +echo "configure:725: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -735,7 +734,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:739: checking for working autoconf" >&5 +echo "configure:738: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -748,7 +747,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:752: checking for working automake" >&5 +echo "configure:751: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -761,7 +760,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:765: checking for working autoheader" >&5 +echo "configure:764: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -774,7 +773,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:778: checking for working makeinfo" >&5 +echo "configure:777: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -786,47 +785,6 @@ echo "$ac_t""missing" 1>&6 fi -for ac_prog in gnutar gtar tar -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:795: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AMTAR"; then - ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AMTAR="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AMTAR="$ac_cv_prog_AMTAR" -if test -n "$AMTAR"; then - echo "$ac_t""$AMTAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AMTAR" && break -done - -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - AMTARFLAGS=o - fi -fi - # This is a sanity check so we can see which version is used in bug reports. @@ -856,7 +814,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:860: checking for $ac_word" >&5 +echo "configure:818: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,7 +844,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:890: checking for $ac_word" >&5 +echo "configure:848: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,7 +895,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:941: checking for $ac_word" >&5 +echo "configure:899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -969,7 +927,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:931: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -980,12 +938,12 @@ cat > conftest.$ac_ext << EOF -#line 984 "configure" +#line 942 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1011,12 +969,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1015: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1020: checking whether we are using GNU C" >&5 +echo "configure:978: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1025,7 +983,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1044,7 +1002,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1048: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1006: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1078,7 +1036,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1082: checking for $ac_word" >&5 +echo "configure:1040: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1112,7 +1070,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1116: checking host system type" >&5 +echo "configure:1074: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1133,7 +1091,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1137: checking build system type" >&5 +echo "configure:1095: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1162,7 +1120,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1166: checking for ld used by GCC" >&5 +echo "configure:1124: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1186,10 +1144,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1190: checking for GNU ld" >&5 +echo "configure:1148: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1193: checking for non-GNU ld" >&5 +echo "configure:1151: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1225,7 +1183,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1229: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1187: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1241,7 +1199,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1245: checking for BSD-compatible nm" >&5 +echo "configure:1203: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1278,7 +1236,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1282: checking whether ln -s works" >&5 +echo "configure:1240: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1304,7 +1262,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1308: checking for $ac_word" >&5 +echo "configure:1266: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1428,8 +1386,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1432 "configure"' > conftest.$ac_ext - if { (eval echo configure:1433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1390 "configure"' > conftest.$ac_ext + if { (eval echo configure:1391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1450,19 +1408,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1454: checking whether the C compiler needs -belf" >&5 +echo "configure:1412: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1672,8 +1630,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g -s%@AMTAR@%$AMTAR%g -s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@pkgdatadir@%$pkgdatadir%g s%@aclocaldir@%$aclocaldir%g diff -druN libtool-1.3/configure.in libtool-1.3.2/configure.in --- libtool-1.3/configure.in Thu Apr 29 10:07:13 1999 +++ libtool-1.3.2/configure.in Tue May 25 21:27:16 1999 @@ -2,7 +2,7 @@ AC_INIT(ltmain.in) -AM_INIT_AUTOMAKE(libtool, 1.3) +AM_INIT_AUTOMAKE(libtool, 1.3.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 diff -druN libtool-1.3/demo/Makefile.in libtool-1.3.2/demo/Makefile.in --- libtool-1.3/demo/Makefile.in Thu Apr 29 10:28:31 1999 +++ libtool-1.3.2/demo/Makefile.in Tue May 25 21:31:11 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -59,8 +59,6 @@ POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ CC = @CC@ DLLTOOL = @DLLTOOL@ @@ -78,7 +76,6 @@ STATIC = @STATIC@ VERSION = @VERSION@ - AUTOMAKE_OPTIONS = no-dependencies foreign EXTRA_DIST = acinclude.m4 @@ -90,9 +87,8 @@ libhello_la_LDFLAGS = -version-info 3:12:1 include_HEADERS = foo.h -@BINARY_HELLDL_TRUE@BUILD_helldl = \ -@BINARY_HELLDL_TRUE@helldl -@BINARY_HELLDL_FALSE@BUILD_helldl = \ +@BINARY_HELLDL_TRUE@BUILD_helldl = helldl +@BINARY_HELLDL_FALSE@BUILD_helldl = bin_PROGRAMS = hell hell.static $(BUILD_helldl) @@ -106,15 +102,11 @@ hell_static_LDFLAGS = $(STATIC) # Create a version of hell that does a preloaded dlopen. -@BINARY_HELLDL_TRUE@helldl_SOURCES = \ -@BINARY_HELLDL_TRUE@dlmain.c -@BINARY_HELLDL_TRUE@helldl_LDFLAGS = \ -@BINARY_HELLDL_TRUE@-export-dynamic -dlpreopen libhello.la -@BINARY_HELLDL_TRUE@helldl_DEPENDENCIES = \ -@BINARY_HELLDL_TRUE@libhello.la +@BINARY_HELLDL_TRUE@helldl_SOURCES = dlmain.c +@BINARY_HELLDL_TRUE@helldl_LDFLAGS = -export-dynamic -dlpreopen libhello.la +@BINARY_HELLDL_TRUE@helldl_DEPENDENCIES = libhello.la -@BINARY_HELLDL_FALSE@bin_SCRIPTS = \ -@BINARY_HELLDL_FALSE@helldl +@BINARY_HELLDL_FALSE@bin_SCRIPTS = helldl #---------------------------------------------------------------------- # The following declarations are only used in the testsuite: @@ -144,7 +136,6 @@ EXTRA_PROGRAMS = hell0 hell0_SOURCES = main.c hell0_LDADD = libhell1.la libhell2.la $(LIBM) -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_CLEAN_FILES = @@ -154,36 +145,28 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libhell0_a_LIBADD = -am_libhell0_a_OBJECTS = hello.o foo.o -libhell0_a_OBJECTS = $(am_libhell0_a_OBJECTS) +libhell0_a_OBJECTS = hello.o foo.o AR = ar LTLIBRARIES = $(lib_LTLIBRARIES) -am_libhell1_la_OBJECTS = hell1.lo -libhell1_la_OBJECTS = $(am_libhell1_la_OBJECTS) -am_libhell2_la_OBJECTS = hell2.lo -libhell2_la_OBJECTS = $(am_libhell2_la_OBJECTS) +libhell1_la_OBJECTS = hell1.lo +libhell2_la_OBJECTS = hell2.lo libhello_la_DEPENDENCIES = -am_libhello_la_OBJECTS = hello.lo foo.lo -libhello_la_OBJECTS = $(am_libhello_la_OBJECTS) -@BINARY_HELLDL_FALSE@bin_PROGRAMS = hell$(EXEEXT) hell.static +libhello_la_OBJECTS = hello.lo foo.lo @BINARY_HELLDL_TRUE@bin_PROGRAMS = hell$(EXEEXT) hell.static \ @BINARY_HELLDL_TRUE@helldl$(EXEEXT) +@BINARY_HELLDL_FALSE@bin_PROGRAMS = hell$(EXEEXT) hell.static PROGRAMS = $(bin_PROGRAMS) -am_hell_OBJECTS = main.o -hell_OBJECTS = $(am_hell_OBJECTS) +hell0_OBJECTS = main.o +hell0_DEPENDENCIES = libhell1.la libhell2.la +hell0_LDFLAGS = +hell_OBJECTS = main.o hell_DEPENDENCIES = libhello.la hell_LDFLAGS = -am_hell_static_OBJECTS = main.o -hell_static_OBJECTS = $(am_hell_static_OBJECTS) +hell_static_OBJECTS = main.o hell_static_DEPENDENCIES = libhello.la -am_hell0_OBJECTS = main.o -hell0_OBJECTS = $(am_hell0_OBJECTS) -hell0_DEPENDENCIES = libhell1.la libhell2.la -hell0_LDFLAGS = -@BINARY_HELLDL_TRUE@am_helldl_OBJECTS = dlmain.o -helldl_OBJECTS = $(am_helldl_OBJECTS) +@BINARY_HELLDL_TRUE@helldl_OBJECTS = dlmain.o helldl_LDADD = $(LDADD) SCRIPTS = $(bin_SCRIPTS) @@ -191,25 +174,23 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libhell0_a_SOURCES) $(libhell1_la_SOURCES) \ -$(libhell2_la_SOURCES) $(libhello_la_SOURCES) $(hell_SOURCES) \ -$(hell_static_SOURCES) $(hell0_SOURCES) $(helldl_SOURCES) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(include_HEADERS) -DIST_COMMON = README $(include_HEADERS) Makefile.am Makefile.in \ -acinclude.m4 aclocal.m4 configure configure.in +DIST_COMMON = README Makefile.am Makefile.in acinclude.m4 aclocal.m4 \ +configure configure.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best -SOURCES = $(libhell0_a_SOURCES) $(libhell1_la_SOURCES) $(libhell2_la_SOURCES) $(libhello_la_SOURCES) $(hell_SOURCES) $(hell_static_SOURCES) $(hell0_SOURCES) $(helldl_SOURCES) -OBJECTS = $(am_libhell0_a_OBJECTS) $(am_libhell1_la_OBJECTS) $(am_libhell2_la_OBJECTS) $(am_libhello_la_OBJECTS) $(am_hell_OBJECTS) $(am_hell_static_OBJECTS) $(am_hell0_OBJECTS) $(am_helldl_OBJECTS) +SOURCES = $(libhell0_a_SOURCES) $(libhell1_la_SOURCES) $(libhell2_la_SOURCES) $(libhello_la_SOURCES) $(hell0_SOURCES) $(hell_SOURCES) $(hell_static_SOURCES) $(helldl_SOURCES) +OBJECTS = $(libhell0_a_OBJECTS) $(libhell1_la_OBJECTS) $(libhell2_la_OBJECTS) $(libhello_la_OBJECTS) $(hell0_OBJECTS) $(hell_OBJECTS) $(hell_static_OBJECTS) $(helldl_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .c .lo .o +.SUFFIXES: .S .c .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile @@ -228,6 +209,12 @@ .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: -rm -f *.o core *.core @@ -239,7 +226,13 @@ maintainer-clean-compile: .c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c -o $@ $< + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo @@ -250,8 +243,6 @@ distclean-libtool: maintainer-clean-libtool: -hello.o: -foo.o: libhell0.a: $(libhell0_a_OBJECTS) $(libhell0_a_DEPENDENCIES) -rm -f libhell0.a @@ -279,20 +270,15 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -hell1.lo: libhell1.la: $(libhell1_la_OBJECTS) $(libhell1_la_DEPENDENCIES) $(LINK) $(libhell1_la_LDFLAGS) $(libhell1_la_OBJECTS) $(libhell1_la_LIBADD) $(LIBS) -hell2.lo: libhell2.la: $(libhell2_la_OBJECTS) $(libhell2_la_DEPENDENCIES) $(LINK) $(libhell2_la_LDFLAGS) $(libhell2_la_OBJECTS) $(libhell2_la_LIBADD) $(LIBS) -hello.lo: -foo.lo: libhello.la: $(libhello_la_OBJECTS) $(libhello_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libhello_la_LDFLAGS) $(libhello_la_OBJECTS) $(libhello_la_LIBADD) $(LIBS) @@ -311,20 +297,20 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -main.o: + +hell0$(EXEEXT): $(hell0_OBJECTS) $(hell0_DEPENDENCIES) + @rm -f hell0$(EXEEXT) + $(LINK) $(hell0_LDFLAGS) $(hell0_OBJECTS) $(hell0_LDADD) $(LIBS) hell$(EXEEXT): $(hell_OBJECTS) $(hell_DEPENDENCIES) @rm -f hell$(EXEEXT) @@ -334,11 +320,6 @@ @rm -f hell.static $(LINK) $(hell_static_LDFLAGS) $(hell_static_OBJECTS) $(hell_static_LDADD) $(LIBS) -hell0$(EXEEXT): $(hell0_OBJECTS) $(hell0_DEPENDENCIES) - @rm -f hell0$(EXEEXT) - $(LINK) $(hell0_LDFLAGS) $(hell0_OBJECTS) $(hell0_LDADD) $(LIBS) -dlmain.o: - helldl$(EXEEXT): $(helldl_OBJECTS) $(helldl_DEPENDENCIES) @rm -f helldl$(EXEEXT) $(LINK) $(helldl_LDFLAGS) $(helldl_OBJECTS) $(helldl_LDADD) $(LIBS) @@ -347,22 +328,19 @@ @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ done uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + list='$(bin_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done install-includeHEADERS: $(include_HEADERS) @@ -370,17 +348,14 @@ $(mkinstalldirs) $(DESTDIR)$(includedir) @list='$(include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ done uninstall-includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ - rm -f $(DESTDIR)$(includedir)/$$f; \ + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/$$p; \ done tags: TAGS @@ -420,7 +395,7 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ @@ -440,11 +415,11 @@ echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) @@ -453,7 +428,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -484,7 +459,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) @@ -542,8 +517,8 @@ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all install-strip \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean # create a script that says that -dlopen is not supported diff -druN libtool-1.3/demo/acinclude.m4 libtool-1.3.2/demo/acinclude.m4 --- libtool-1.3/demo/acinclude.m4 Thu Apr 29 10:28:29 1999 +++ libtool-1.3.2/demo/acinclude.m4 Thu May 20 20:33:27 1999 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,5 +423,5 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff -druN libtool-1.3/demo/aclocal.m4 libtool-1.3.2/demo/aclocal.m4 --- libtool-1.3/demo/aclocal.m4 Thu Apr 29 10:28:29 1999 +++ libtool-1.3.2/demo/aclocal.m4 Tue May 25 21:31:10 1999 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl PARTICULAR PURPOSE. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -372,6 +372,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -395,9 +396,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -410,8 +413,8 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -424,8 +427,6 @@ AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -446,19 +447,6 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -dnl We check for tar when the user configures the end package. -dnl This is sad, since we only need this for "dist". However, -dnl there's no other good way to do it. We prefer GNU tar if -dnl we can find it. If we can't find a tar, it doesn't really matter. -AC_CHECK_PROGS(AMTAR, gnutar gtar tar) -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - dnl We have GNU tar. - AMTARFLAGS=o - fi -fi -AC_SUBST(AMTARFLAGS) AC_REQUIRE([AC_PROG_MAKE_SET])]) # diff -druN libtool-1.3/demo/configure libtool-1.3.2/demo/configure --- libtool-1.3/demo/configure Thu Apr 29 10:28:31 1999 +++ libtool-1.3.2/demo/configure Tue May 25 21:31:12 1999 @@ -699,7 +699,6 @@ fi - PACKAGE=hell VERSION=1.0 @@ -719,7 +718,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:723: checking for working aclocal" >&5 +echo "configure:722: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -732,7 +731,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:736: checking for working autoconf" >&5 +echo "configure:735: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -745,7 +744,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:749: checking for working automake" >&5 +echo "configure:748: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -758,7 +757,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:762: checking for working autoheader" >&5 +echo "configure:761: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -771,7 +770,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:775: checking for working makeinfo" >&5 +echo "configure:774: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -783,53 +782,12 @@ echo "$ac_t""missing" 1>&6 fi -for ac_prog in gnutar gtar tar -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:792: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AMTAR"; then - ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AMTAR="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AMTAR="$ac_cv_prog_AMTAR" -if test -n "$AMTAR"; then - echo "$ac_t""$AMTAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AMTAR" && break -done - -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - AMTARFLAGS=o - fi -fi - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:833: checking for $ac_word" >&5 +echo "configure:791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -859,7 +817,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:863: checking for $ac_word" >&5 +echo "configure:821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -910,7 +868,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:914: checking for $ac_word" >&5 +echo "configure:872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -942,7 +900,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -953,12 +911,12 @@ cat > conftest.$ac_ext << EOF -#line 957 "configure" +#line 915 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -984,12 +942,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:993: checking whether we are using GNU C" >&5 +echo "configure:951: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -998,7 +956,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1017,7 +975,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1021: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:979: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1049,12 +1007,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1053: checking for working const" >&5 +echo "configure:1011: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1124,12 +1082,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1128: checking for Cygwin environment" >&5 +echo "configure:1086: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1157,19 +1115,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1161: checking for mingw32 environment" >&5 +echo "configure:1119: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1188,7 +1146,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1192: checking for executable suffix" >&5 +echo "configure:1150: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1198,7 +1156,7 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1295,7 +1253,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1299: checking host system type" >&5 +echo "configure:1257: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1316,7 +1274,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1320: checking build system type" >&5 +echo "configure:1278: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1336,7 +1294,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1340: checking for $ac_word" >&5 +echo "configure:1298: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1375,7 +1333,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1379: checking for ld used by GCC" >&5 +echo "configure:1337: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1399,10 +1357,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1403: checking for GNU ld" >&5 +echo "configure:1361: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1406: checking for non-GNU ld" >&5 +echo "configure:1364: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1438,7 +1396,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1442: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1400: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1454,7 +1412,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1458: checking for BSD-compatible nm" >&5 +echo "configure:1416: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1491,7 +1449,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1495: checking whether ln -s works" >&5 +echo "configure:1453: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1535,8 +1493,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1539 "configure"' > conftest.$ac_ext - if { (eval echo configure:1540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1497 "configure"' > conftest.$ac_ext + if { (eval echo configure:1498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1557,19 +1515,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1561: checking whether the C compiler needs -belf" >&5 +echo "configure:1519: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1690,7 +1648,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1694: checking how to run the C preprocessor" >&5 +echo "configure:1652: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1705,13 +1663,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1673: \"$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 : @@ -1722,13 +1680,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1690: \"$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 : @@ -1739,13 +1697,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1707: \"$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 : @@ -1773,17 +1731,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1777: checking for $ac_hdr" >&5 +echo "configure:1735: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1745: \"$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 rm -rf conftest* @@ -1817,7 +1775,7 @@ ;; *-ncr-sysv4.3*) echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6 -echo "configure:1821: checking for _mwvalidcheckl in -lmw" >&5 +echo "configure:1779: checking for _mwvalidcheckl in -lmw" >&5 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1825,7 +1783,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1857,7 +1815,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1861: checking for main in -lm" >&5 +echo "configure:1819: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1865,14 +1823,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1895,7 +1853,7 @@ ;; *) echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1899: checking for main in -lm" >&5 +echo "configure:1857: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1903,14 +1861,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2090,8 +2048,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g -s%@AMTAR@%$AMTAR%g -s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@EXEEXT@%$EXEEXT%g diff -druN libtool-1.3/demo/foo.h libtool-1.3.2/demo/foo.h --- libtool-1.3/demo/foo.h Wed Jan 13 19:39:08 1999 +++ libtool-1.3.2/demo/foo.h Fri May 21 09:04:38 1999 @@ -45,23 +45,31 @@ # define __END_DECLS /* empty */ #endif -/* __P is a macro used to wrap function prototypes, so that compilers +/* LTDL_PARAMS is a macro used to wrap function prototypes, so that compilers that don't understand ANSI C prototypes still work, and ANSI C compilers can issue warnings about type mismatches. */ -#undef __P +#undef LTDL_PARAMS #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(__CYGWIN32__) || defined(__cplusplus) -# define __P(protos) protos +# define LTDL_PARAMS(protos) protos # define lt_ptr_t void* #else -# define __P(protos) () +# define LTDL_PARAMS(protos) () # define lt_ptr_t char* #endif #ifdef __CYGWIN32__ -# ifdef _LIBFOO_COMPILATION_ -# define EXTERN __declspec(dllexport) +# ifdef LIBFOO_DLL + /* need some (as yet non-existant) automake magic to tell + * the object whether the libfoo it will be linked with is + * a dll or not, ie whether LIBFOO_DLL is defined or not. + */ +# ifdef _LIBFOO_COMPILATION_ +# define EXTERN __declspec(dllexport) +# else +# define EXTERN extern __declspec(dllimport) +# endif # else -# define EXTERN extern __declspec(dllimport) +# define EXTERN extern # endif #else # define EXTERN extern @@ -74,8 +82,8 @@ /* Declarations. Note the wonderful use of the above macros. */ __BEGIN_DECLS -int foo __P((void)); -int hello __P((void)); +int foo LTDL_PARAMS((void)); +int hello LTDL_PARAMS((void)); EXTERN int nothing; __END_DECLS diff -druN libtool-1.3/doc/Makefile.in libtool-1.3.2/doc/Makefile.in --- libtool-1.3/doc/Makefile.in Thu Apr 29 10:33:32 1999 +++ libtool-1.3.2/doc/Makefile.in Tue May 25 21:32:35 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -60,8 +60,6 @@ host_alias = @host_alias@ host_triplet = @host@ ACINCLUDE_M4_LIST = @ACINCLUDE_M4_LIST@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ AWK = @AWK@ CC = @CC@ @@ -81,14 +79,11 @@ aclocaldir = @aclocaldir@ pkgdatadir = @pkgdatadir@ - AUTOMAKE_OPTIONS = gnits info_TEXINFOS = libtool.texi libtool_TEXINFOS = PLATFORMS -subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = -DIST_SOURCES = TEXI2DVI = texi2dvi INFO_DEPS = libtool.info DVIS = libtool.dvi @@ -97,8 +92,9 @@ stamp-vti texinfo.tex version.texi -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -146,7 +142,7 @@ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .texi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=.:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .texi: @@ -165,7 +161,7 @@ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .texinfo.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=.:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .txi.info: @@ -174,7 +170,7 @@ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .txi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=.:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .txi: @@ -209,19 +205,17 @@ uninstall-info: $(PRE_UNINSTALL) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ - done; \ - else :; fi + ii=yes; \ + else ii=; fi; \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + test -z "$ii" \ + || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + done @$(NORMAL_UNINSTALL) - @list='$(INFO_DEPS)'; \ + list='$(INFO_DEPS)'; \ for file in $$list; do \ - (if cd $(DESTDIR)$(infodir); then \ - echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ - rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ - else :; fi); \ + (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done dist-info: $(INFO_DEPS) @@ -237,10 +231,9 @@ mostlyclean-aminfo: -rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \ - libtool.fns libtool.pgs libtool.ky libtool.kys libtool.ps \ - libtool.log libtool.pg libtool.toc libtool.tp libtool.tps \ - libtool.vr libtool.vrs libtool.op libtool.tr libtool.cv \ - libtool.cn + libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \ + libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \ + libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn clean-aminfo: @@ -259,11 +252,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = doc + distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -293,7 +288,7 @@ all-am: Makefile $(INFO_DEPS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(infodir) @@ -331,8 +326,8 @@ clean-aminfo maintainer-clean-aminfo tags distdir info-am info dvi-am \ dvi check check-am installcheck-am installcheck install-exec-am \ install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all install-strip \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -druN libtool-1.3/doc/PLATFORMS libtool-1.3.2/doc/PLATFORMS --- libtool-1.3/doc/PLATFORMS Thu Apr 29 08:44:46 1999 +++ libtool-1.3.2/doc/PLATFORMS Tue May 25 13:20:29 1999 @@ -2,16 +2,16 @@ canonical host name compiler libtool results (tools versions) release ------------------------------------------------------- -alpha-dec-osf4.0* gcc 1.3 ok +alpha-dec-osf4.0* gcc 1.3.2 ok (egcs-1.1.2) -alpha-dec-osf4.0* cc 1.3 ok +alpha-dec-osf4.0* cc 1.3.2 ok alpha-dec-osf3.2 gcc 0.8 ok alpha-dec-osf3.2 cc 0.8 ok alpha-dec-osf2.1 gcc 1.2f NS -alpha*-unknown-linux-gnu gcc 1.3 ok - (egcs-1.1.2, GNU ld 2.9.1.0.15) +alpha*-unknown-linux-gnu gcc 1.3.2 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 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 @@ -28,17 +28,17 @@ 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 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 i*86-*-freebsdelf3.1 gcc 1.2f ok i*86-*-freebsd3.0 gcc 1.2e ok i*86-*-freebsd2.2.8 gcc 1.2f ok -i*86-*-freebsd2.2.6 gcc 1.3 ok +i*86-*-freebsd2.2.6 gcc 1.3.2 ok (egcs-1.1 & gcc-2.7.2.1, native ld) i*86-*-freebsd2.1.5 gcc 0.5 ok -i*86-*-gnu0.3 gcc 1.2b ok +i*86-*-gnu gcc 1.3.2 ok i*86-*-netbsd1.4 gcc 1.3 ok (egcs-1.1.1) i*86-*-netbsd1.3.3 gcc 1.3 ok @@ -47,11 +47,11 @@ 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 ok - (egcs-1.1.2, GNU ld 2.9.1) +i*86-*-linux-gnu gcc 1.3.2 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 ok +i*86-*-solaris2.7 gcc 1.3.2 ok (egcs-1.1.2, native ld) i*86-*-solaris2.6 gcc 1.2f ok i*86-*-solaris2.5.1 gcc 1.2f ok @@ -67,9 +67,9 @@ mips-sgi-irix6.5 gcc 1.2f ok (gcc-2.8.1) mips-sgi-irix6.4 gcc 1.2f ok -mips-sgi-irix6.3 gcc 1.3 ok +mips-sgi-irix6.3 gcc 1.3.2 ok (egcs-1.1.2, native ld) -mips-sgi-irix6.3 cc 1.3 ok +mips-sgi-irix6.3 cc 1.3.2 ok (cc 7.0) mips-sgi-irix6.2 gcc 1.2f ok mips-sgi-irix6.2 cc 0.9 ok @@ -78,9 +78,9 @@ mips-sgi-irix5.3 gcc 1.2f NS (gcc-2.6.3) mips-sgi-irix5.3 cc 0.8 ok -mips-sgi-irix5.2 gcc 1.3 ok +mips-sgi-irix5.2 gcc 1.3.2 ok (egcs-1.1.2, native ld) -mips-sgi-irix5.2 cc 1.3 ok +mips-sgi-irix5.2 cc 1.3.2 ok (cc 3.18) mipsel-unknown-openbsd2.1 gcc 1.0 ok powerpc-ibm-aix4.3.1.0 gcc 1.2f ok @@ -99,13 +99,14 @@ (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.7 gcc 1.2f ok -sparc-sun-solaris2.6 gcc 1.3 ok +sparc-sun-solaris2.7 gcc 1.3.2 ok + (egcs-1.1.2, GNU ld 2.9.1 & native ld) +sparc-sun-solaris2.6 gcc 1.3.2 ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) sparc-sun-solaris2.5.1 gcc 1.2f ok -sparc-sun-solaris2.5 gcc 1.3 ok +sparc-sun-solaris2.5 gcc 1.3.2 ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) -sparc-sun-solaris2.5 cc 1.3 ok +sparc-sun-solaris2.5 cc 1.3.2 ok (SC 3.0.1) sparc-sun-solaris2.4 gcc 1.0a ok sparc-sun-solaris2.4 cc 1.0a ok @@ -114,11 +115,13 @@ sparc-sun-sunos4.1.4 cc 1.0f ok sparc-sun-sunos4.1.3_U1 gcc 1.2f ok sparc-sun-sunos4.1.3C gcc 1.2f ok -sparc-sun-sunos4.1.3 gcc 1.3 ok +sparc-sun-sunos4.1.3 gcc 1.3.2 ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) -sparc-sun-sunos4.1.3 cc 1.3 ok +sparc-sun-sunos4.1.3 cc 1.3.2 ok sparc-unknown-bsdi4.0 gcc 1.2c ok sparc-unknown-linux-gnulibc1 gcc 1.2f ok +sparc-unknown-linux-gnu gcc 1.3.2 ok + (egcs-1.1.2, GNU ld 2.9.1.0.23) sparc64-unknown-linux-gnu gcc 1.2f ok Notes: diff -druN libtool-1.3/doc/libtool.info libtool-1.3.2/doc/libtool.info --- libtool-1.3/doc/libtool.info Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/libtool.info Tue May 25 21:31:51 1999 @@ -11,7 +11,7 @@ * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 1.3 + This file documents GNU Libtool 1.3.2 Copyright (C) 1996-1999 Free Software Foundation, Inc. @@ -31,82 +31,82 @@  Indirect: -libtool.info-1: 1162 -libtool.info-2: 49654 -libtool.info-3: 96652 -libtool.info-4: 139924 +libtool.info-1: 1164 +libtool.info-2: 49795 +libtool.info-3: 97238 +libtool.info-4: 141608  Tag Table: (Indirect) -Node: Top1162 -Node: Introduction6703 -Node: Motivation8524 -Node: Issues9839 -Node: Other implementations11304 -Node: Postmortem11842 -Node: Libtool paradigm13458 -Node: Using libtool14402 -Node: Creating object files16517 -Node: Linking libraries18967 -Node: Linking executables22002 -Node: Debugging executables27239 -Node: Installing libraries29948 -Node: Installing executables33158 -Node: Static libraries33948 -Node: Invoking libtool36843 -Node: Compile mode39179 -Node: Link mode40931 -Node: Execute mode45835 -Node: Install mode46610 -Node: Finish mode47061 -Node: Uninstall mode47491 -Node: Integrating libtool47901 -Node: Makefile rules48583 -Node: Using Automake49654 -Node: Configuring52175 -Node: Invoking ltconfig53420 -Node: ltconfig example58239 -Node: AM_PROG_LIBTOOL59973 -Node: Distributing64951 -Node: Invoking libtoolize65865 -Node: Autoconf .o macros67591 -Node: Static-only libraries68795 -Node: Versioning70258 -Node: Interfaces71629 -Node: Libtool versioning72257 -Node: Updating version info74465 -Node: Release numbers76340 -Node: Library tips78181 -Node: C header files80497 -Node: Inter-library dependencies83794 -Node: Dlopened modules86681 -Node: Building modules88656 -Node: Dlpreopening89836 -Node: Finding the dlname92677 -Node: Dlopen issues94024 -Node: Using libltdl95073 -Node: Libltdl interface96652 -Node: Modules for libltdl103625 -Node: Distributing libltdl106121 -Node: Other languages110854 -Node: C++ libraries111483 -Node: Troubleshooting113358 -Node: Libtool test suite113890 -Node: Test descriptions114616 -Node: When tests fail119798 -Node: Reporting bugs120682 -Node: Maintaining122296 -Node: New ports123011 -Node: Information sources123697 -Node: Porting inter-library dependencies126154 -Node: Tested platforms128843 -Node: Platform quirks135849 -Node: References136749 -Node: Compilers137182 -Node: Reloadable objects139036 -Node: Archivers139372 -Node: libtool script contents139924 -Node: Cheap tricks153163 -Node: Index154723 +Node: Top1164 +Node: Introduction6707 +Node: Motivation8528 +Node: Issues9843 +Node: Other implementations11308 +Node: Postmortem11846 +Node: Libtool paradigm13462 +Node: Using libtool14406 +Node: Creating object files16521 +Node: Linking libraries18971 +Node: Linking executables22006 +Node: Debugging executables27243 +Node: Installing libraries29952 +Node: Installing executables33162 +Node: Static libraries33952 +Node: Invoking libtool36984 +Node: Compile mode39320 +Node: Link mode41072 +Node: Execute mode45976 +Node: Install mode46751 +Node: Finish mode47202 +Node: Uninstall mode47632 +Node: Integrating libtool48042 +Node: Makefile rules48724 +Node: Using Automake49795 +Node: Configuring52370 +Node: Invoking ltconfig53615 +Node: ltconfig example58434 +Node: AM_PROG_LIBTOOL60168 +Node: Distributing65533 +Node: Invoking libtoolize66447 +Node: Autoconf .o macros68173 +Node: Static-only libraries69377 +Node: Versioning70840 +Node: Interfaces72211 +Node: Libtool versioning72839 +Node: Updating version info75047 +Node: Release numbers76922 +Node: Library tips78763 +Node: C header files81079 +Node: Inter-library dependencies84376 +Node: Dlopened modules87265 +Node: Building modules89242 +Node: Dlpreopening90422 +Node: Finding the dlname93263 +Node: Dlopen issues94610 +Node: Using libltdl95659 +Node: Libltdl interface97238 +Node: Modules for libltdl104211 +Node: Distributing libltdl106707 +Node: Other languages112390 +Node: C++ libraries113019 +Node: Troubleshooting114894 +Node: Libtool test suite115426 +Node: Test descriptions116152 +Node: When tests fail121334 +Node: Reporting bugs122218 +Node: Maintaining123832 +Node: New ports124547 +Node: Information sources125233 +Node: Porting inter-library dependencies127690 +Node: Tested platforms130379 +Node: Platform quirks137533 +Node: References138433 +Node: Compilers138866 +Node: Reloadable objects140720 +Node: Archivers141056 +Node: libtool script contents141608 +Node: Cheap tricks154847 +Node: Index156407  End Tag Table diff -druN libtool-1.3/doc/libtool.info-1 libtool-1.3.2/doc/libtool.info-1 --- libtool-1.3/doc/libtool.info-1 Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/libtool.info-1 Tue May 25 21:31:50 1999 @@ -11,7 +11,7 @@ * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 1.3 + This file documents GNU Libtool 1.3.2 Copyright (C) 1996-1999 Free Software Foundation, Inc. @@ -37,7 +37,7 @@ This file documents GNU Libtool, a script that allows package developers to provide generic shared library support. This edition -documents version 1.3. +documents version 1.3.2. *Note Reporting bugs::, for information on how to report problems with libtool. @@ -859,8 +859,10 @@ You can create a "convenience library" out of those objects, and link programs with the library, instead of listing all object files for every program. This technique is often used to overcome GNU automake's -lack of support for linking object files from other directories, -because it supports linking with libraries from other directories. +lack of support for linking object files built from sources in other +directories, because it supports linking with libraries from other +directories. This limitation applies to GNU automake up to release +1.4; newer releases should support sources in other directories. If you just want to link this convenience library into programs, then you could just ignore libtool entirely, and use the old `ar' and diff -druN libtool-1.3/doc/libtool.info-2 libtool-1.3.2/doc/libtool.info-2 --- libtool-1.3/doc/libtool.info-2 Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/libtool.info-2 Tue May 25 21:31:50 1999 @@ -11,7 +11,7 @@ * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 1.3 + This file documents GNU Libtool 1.3.2 Copyright (C) 1996-1999 Free Software Foundation, Inc. @@ -91,8 +91,8 @@ libhello_la_SOURCES = hello.c foo.c libhello_la_LDFLAGS = -version-info 3:12:1 - The `-rpath' option is passed automatically by Automake, so you -should not specify it. + The `-rpath' option is passed automatically by Automake (except for +libraries listed as `noinst_LTLIBRARIES'), so you should not specify it. *Note Building a Shared Library: (automake)A Shared Library, for more information. @@ -422,6 +422,13 @@ `AM_PROG_LIBTOOL'. If you use Automake, the `aclocal' program will automatically add `AM_PROG_LIBTOOL' support to your `configure' script. + Nevertheless, it is advisable to include a copy of `libtool.m4' in +`acinclude.m4', so that, even if `aclocal.m4' and `configure' are +rebuilt for any reason, the appropriate libtool macros will be used. +The alternative is to hope the user will have a compatible version of +`libtool.m4' installed and accessible for `aclocal'. This may lead to +weird errors when versions don't match. + ---------- Footnotes ---------- (1) `AM_PROG_LIBTOOL' requires that you define the `Makefile' @@ -999,7 +1006,7 @@ ---------- Footnotes ---------- - (1) Unfortunately, as of libtool version 1.3, there is no way to + (1) Unfortunately, as of libtool version 1.3.2, there is no way to specify inter-library dependencies on libtool libraries that have not yet been installed. Libtool 1.4 will support this feature. @@ -1029,7 +1036,7 @@ language interpreters to provide an efficient way to extend the language. - As of version 1.3, libtool provides support for dlopened modules. + As of version 1.3.2, libtool provides support for dlopened modules. However, you should indicate that your package is willing to use such support, by using the macro `AC_LIBTOOL_DLOPEN' in `configure.in'. If this macro is not used (or it is used *after* `AM_PROG_LIBTOOL'), diff -druN libtool-1.3/doc/libtool.info-3 libtool-1.3.2/doc/libtool.info-3 --- libtool-1.3/doc/libtool.info-3 Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/libtool.info-3 Tue May 25 21:31:51 1999 @@ -11,7 +11,7 @@ * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 1.3 + This file documents GNU Libtool 1.3.2 Copyright (C) 1996-1999 Free Software Foundation, Inc. @@ -307,17 +307,29 @@ `configure.in' will configure libltdl, using `AC_CONFIG_SUBDIRS', and that your `Makefile's will start sub-makes within libltdl's directory, using automake's SUBDIRS, for example. Both macros define the shell -variable LIBLTDL to the link flag that you should use to link with -libltdl. It is up to you to use `AC_SUBST' to ensure that this -variable will be available in `Makefile's. +variables LIBLTDL, to the link flag that you should use to link with +libltdl, and INCLTDL, to the preprocessor flag that you should use to +compile with programs that include `ltdl.h'. It is up to you to use +`AC_SUBST' to ensure that this variable will be available in +`Makefile's, or add them to variables that are `AC_SUBST'ed by default, +such as LIBS and CPPFLAGS. - If you're using the convenience libltdl, it will be the pathname for -the convenience version of libltdl, starting with `${top_builddir}/'. -Otherwise, if an installed version of libltdl is found, LIBLTDL will be -set to `-lltdl'. If an installable version of libltdl must be built, -its pathname, starting with `${top_builddir}/', will be stored in -LIBLTDL. So, when you want to link a program with libltdl, just link -it with `$(LIBLTDL)'. + If you're using the convenience libltdl, LIBLTDL will be the +pathname for the convenience version of libltdland INCLTDL will be `-I' +followed by the directory that contains libltdl, both starting with +`${top_builddir}/'. + + If you request an installed version of libltdl and one is found(1), +LIBLTDL will be set to `-lltdl' and INCLTDL will be empty (which is +just a blind assumption that `ltdl.h' is somewhere in the include path +if libltdl is in the library path). If an installable version of +libltdl must be built, its pathname, starting with `${top_builddir}/', +will be stored in LIBLTDL, and INCLTDL will be set just like in the +case of convenience library. + + So, when you want to link a program with libltdl, be it a +convenience, installed or installable library, just compile with +`$(INCLTDL)' and link it with `$(LIBLTDL)', using libtool. You should probably also add `AC_LIBTOOL_DLOPEN' to your `configure.in' *before* `AM_PROG_LIBTOOL', otherwise libtool will @@ -329,8 +341,8 @@ dlopening functions may not be available for static linking. The following example shows you how to embed the convenience libltdl -in your package. In order to use the installable variant just replace -AC_LIBLTDL_CONVENIENCE with AC_LIBLTDL_INSTALLABLE. We assume that +in your package. In order to use the installable variant just replace +`AC_LIBLTDL_CONVENIENCE' with `AC_LIBLTDL_INSTALLABLE'. We assume that libltdl was embedded using `libtoolize --ltdl'. configure.in: @@ -344,6 +356,8 @@ AC_LIBLTDL_CONVENIENCE dnl Substitute LIBLTDL in the Makefiles AC_SUBST(LIBLTDL) + dnl Add INCLTDL to the include path + CPPFLAGS="$CPPFLAGS $INCLTDL" dnl Configure libltdl AC_CONFIG_SUBDIRS(libltdl) ... @@ -358,6 +372,13 @@ myprog_DEPENDENCIES = $(LIBLTDL) libfoo.la ... + ---------- Footnotes ---------- + + (1) Even if libltdl is installed, `AC_LIBLTDL_INSTALLABLE' may fail +to detect it, if libltdl depends on symbols provided by libraries other +than the C library. In this case, it will needlessly build and install +libltdl. +  File: libtool.info, Node: Other languages, Next: Troubleshooting, Prev: Using libltdl, Up: Top @@ -808,16 +829,16 @@ canonical host name compiler libtool results (tools versions) release ------------------------------------------------------- - alpha-dec-osf4.0* gcc 1.3 ok + alpha-dec-osf4.0* gcc 1.3.2 ok (egcs-1.1.2) - alpha-dec-osf4.0* cc 1.3 ok + alpha-dec-osf4.0* cc 1.3.2 ok alpha-dec-osf3.2 gcc 0.8 ok alpha-dec-osf3.2 cc 0.8 ok alpha-dec-osf2.1 gcc 1.2f NS - alpha*-unknown-linux-gnu gcc 1.3 ok - (egcs-1.1.2, GNU ld 2.9.1.0.15) + alpha*-unknown-linux-gnu gcc 1.3.2 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 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 @@ -834,17 +855,17 @@ 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 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 i*86-*-freebsdelf3.1 gcc 1.2f ok i*86-*-freebsd3.0 gcc 1.2e ok i*86-*-freebsd2.2.8 gcc 1.2f ok - i*86-*-freebsd2.2.6 gcc 1.3 ok + i*86-*-freebsd2.2.6 gcc 1.3.2 ok (egcs-1.1 & gcc-2.7.2.1, native ld) i*86-*-freebsd2.1.5 gcc 0.5 ok - i*86-*-gnu0.3 gcc 1.2b ok + i*86-*-gnu gcc 1.3.2 ok i*86-*-netbsd1.4 gcc 1.3 ok (egcs-1.1.1) i*86-*-netbsd1.3.3 gcc 1.3 ok @@ -853,11 +874,11 @@ 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 ok - (egcs-1.1.2, GNU ld 2.9.1) + i*86-*-linux-gnu gcc 1.3.2 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 ok + i*86-*-solaris2.7 gcc 1.3.2 ok (egcs-1.1.2, native ld) i*86-*-solaris2.6 gcc 1.2f ok i*86-*-solaris2.5.1 gcc 1.2f ok @@ -873,9 +894,9 @@ mips-sgi-irix6.5 gcc 1.2f ok (gcc-2.8.1) mips-sgi-irix6.4 gcc 1.2f ok - mips-sgi-irix6.3 gcc 1.3 ok + mips-sgi-irix6.3 gcc 1.3.2 ok (egcs-1.1.2, native ld) - mips-sgi-irix6.3 cc 1.3 ok + mips-sgi-irix6.3 cc 1.3.2 ok (cc 7.0) mips-sgi-irix6.2 gcc 1.2f ok mips-sgi-irix6.2 cc 0.9 ok @@ -884,9 +905,9 @@ mips-sgi-irix5.3 gcc 1.2f NS (gcc-2.6.3) mips-sgi-irix5.3 cc 0.8 ok - mips-sgi-irix5.2 gcc 1.3 ok + mips-sgi-irix5.2 gcc 1.3.2 ok (egcs-1.1.2, native ld) - mips-sgi-irix5.2 cc 1.3 ok + mips-sgi-irix5.2 cc 1.3.2 ok (cc 3.18) mipsel-unknown-openbsd2.1 gcc 1.0 ok powerpc-ibm-aix4.3.1.0 gcc 1.2f ok @@ -905,13 +926,14 @@ (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.7 gcc 1.2f ok - sparc-sun-solaris2.6 gcc 1.3 ok + sparc-sun-solaris2.7 gcc 1.3.2 ok + (egcs-1.1.2, GNU ld 2.9.1 & native ld) + sparc-sun-solaris2.6 gcc 1.3.2 ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) sparc-sun-solaris2.5.1 gcc 1.2f ok - sparc-sun-solaris2.5 gcc 1.3 ok + sparc-sun-solaris2.5 gcc 1.3.2 ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) - sparc-sun-solaris2.5 cc 1.3 ok + sparc-sun-solaris2.5 cc 1.3.2 ok (SC 3.0.1) sparc-sun-solaris2.4 gcc 1.0a ok sparc-sun-solaris2.4 cc 1.0a ok @@ -920,11 +942,13 @@ sparc-sun-sunos4.1.4 cc 1.0f ok sparc-sun-sunos4.1.3_U1 gcc 1.2f ok sparc-sun-sunos4.1.3C gcc 1.2f ok - sparc-sun-sunos4.1.3 gcc 1.3 ok + sparc-sun-sunos4.1.3 gcc 1.3.2 ok (egcs-1.1.2, GNU ld 2.9.1 & native ld) - sparc-sun-sunos4.1.3 cc 1.3 ok + sparc-sun-sunos4.1.3 cc 1.3.2 ok sparc-unknown-bsdi4.0 gcc 1.2c ok sparc-unknown-linux-gnulibc1 gcc 1.2f ok + sparc-unknown-linux-gnu gcc 1.3.2 ok + (egcs-1.1.2, GNU ld 2.9.1.0.23) sparc64-unknown-linux-gnu gcc 1.2f ok Notes: diff -druN libtool-1.3/doc/libtool.info-4 libtool-1.3.2/doc/libtool.info-4 --- libtool-1.3/doc/libtool.info-4 Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/libtool.info-4 Tue May 25 21:31:51 1999 @@ -11,7 +11,7 @@ * libtoolize: (libtool)Invoking libtoolize. Adding libtool support. END-INFO-DIR-ENTRY - This file documents GNU Libtool 1.3 + This file documents GNU Libtool 1.3.2 Copyright (C) 1996-1999 Free Software Foundation, Inc. diff -druN libtool-1.3/doc/libtool.texi libtool-1.3.2/doc/libtool.texi --- libtool-1.3/doc/libtool.texi Thu Apr 29 08:03:30 1999 +++ libtool-1.3.2/doc/libtool.texi Tue May 25 11:14:52 1999 @@ -984,9 +984,11 @@ programs. You can create a ``convenience library'' out of those objects, and link programs with the library, instead of listing all object files for every program. This technique is often used to -overcome GNU automake's lack of support for linking object files from -other directories, because it supports linking with libraries from other -directories. +overcome GNU automake's lack of support for linking object files built +from sources in other directories, because it supports linking with +libraries from other directories. This limitation applies to GNU +automake up to release 1.4; newer releases should support sources in +other directories. If you just want to link this convenience library into programs, then you could just ignore libtool entirely, and use the old @code{ar} and @@ -1466,7 +1468,8 @@ libhello_la_LDFLAGS = -version-info 3:12:1 @end example -The @samp{-rpath} option is passed automatically by Automake, so you +The @samp{-rpath} option is passed automatically by Automake (except for +libraries listed as @code{noinst_LTLIBRARIES}), so you should not specify it. @xref{A Shared Library, Building a Shared Library, The Automake Manual, @@ -1831,6 +1834,14 @@ will automatically add @code{AM_PROG_LIBTOOL} support to your @code{configure} script. +Nevertheless, it is advisable to include a copy of @file{libtool.m4} in +@file{acinclude.m4}, so that, even if @file{aclocal.m4} and +@file{configure} are rebuilt for any reason, the appropriate libtool +macros will be used. The alternative is to hope the user will have a +compatible version of @file{libtool.m4} installed and accessible for +@code{aclocal}. This may lead to weird errors when versions don't +match. + @node Distributing @section Including libtool in your package @@ -3036,18 +3047,34 @@ @file{configure.in} will configure libltdl, using @samp{AC_CONFIG_SUBDIRS}, and that your @file{Makefile}s will start sub-makes within libltdl's directory, using automake's @var{SUBDIRS}, -for example. Both macros define the shell variable @var{LIBLTDL} to -the link flag that you should use to link with libltdl. It is up to you -to use @samp{AC_SUBST} to ensure that this variable will be available in -@file{Makefile}s. +for example. Both macros define the shell variables @var{LIBLTDL}, to +the link flag that you should use to link with libltdl, and +@var{INCLTDL}, to the preprocessor flag that you should use to compile +with programs that include @file{ltdl.h}. It is up to you to use +@samp{AC_SUBST} to ensure that this variable will be available in +@file{Makefile}s, or add them to variables that are @samp{AC_SUBST}ed by +default, such as @var{LIBS} and @var{CPPFLAGS}. -If you're using the convenience libltdl, it will be the pathname for the -convenience version of libltdl, starting with @samp{$@{top_builddir@}/}. -Otherwise, if an installed version of libltdl is found, @var{LIBLTDL} -will be set to @samp{-lltdl}. If an installable version of libltdl must -be built, its pathname, starting with @samp{$@{top_builddir@}/}, will be -stored in @var{LIBLTDL}. So, when you want to link a program with -libltdl, just link it with @samp{$(LIBLTDL)}. +If you're using the convenience libltdl, @var{LIBLTDL} will be the +pathname for the convenience version of libltdland @var{INCLTDL} will be +@samp{-I} followed by the directory that contains libltdl, both starting +with @samp{$@{top_builddir@}/}. + +If you request an installed version of libltdl and one is +found@footnote{Even if libltdl is installed, +@samp{AC_LIBLTDL_INSTALLABLE} may fail to detect it, if libltdl depends +on symbols provided by libraries other than the C library. In this +case, it will needlessly build and install libltdl.}, @var{LIBLTDL} will +be set to @samp{-lltdl} and @var{INCLTDL} will be empty (which is just a +blind assumption that @file{ltdl.h} is somewhere in the include path if +libltdl is in the library path). If an installable version of libltdl +must be built, its pathname, starting with @samp{$@{top_builddir@}/}, +will be stored in @var{LIBLTDL}, and @var{INCLTDL} will be set just like +in the case of convenience library. + +So, when you want to link a program with libltdl, be it a convenience, +installed or installable library, just compile with @samp{$(INCLTDL)} +and link it with @samp{$(LIBLTDL)}, using libtool. You should probably also add @samp{AC_LIBTOOL_DLOPEN} to your @file{configure.in} @emph{before} @samp{AM_PROG_LIBTOOL}, otherwise @@ -3058,10 +3085,10 @@ 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 your package. In order to use the installable variant just replace -AC_LIBLTDL_CONVENIENCE with AC_LIBLTDL_INSTALLABLE. We assume that -libltdl was embedded using @samp{libtoolize --ltdl}. +The following example shows you how to embed the convenience libltdl in +your package. In order to use the installable variant just replace +@samp{AC_LIBLTDL_CONVENIENCE} with @samp{AC_LIBLTDL_INSTALLABLE}. We +assume that libltdl was embedded using @samp{libtoolize --ltdl}. configure.in: @example @@ -3075,6 +3102,8 @@ AC_LIBLTDL_CONVENIENCE dnl Substitute LIBLTDL in the Makefiles AC_SUBST(LIBLTDL) +dnl Add INCLTDL to the include path +CPPFLAGS="$CPPFLAGS $INCLTDL" dnl Configure libltdl AC_CONFIG_SUBDIRS(libltdl) ... diff -druN libtool-1.3/doc/stamp-vti libtool-1.3.2/doc/stamp-vti --- libtool-1.3/doc/stamp-vti Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/stamp-vti Tue May 25 21:31:49 1999 @@ -1,3 +1,3 @@ -@set UPDATED 29 April 1999 -@set EDITION 1.3 -@set VERSION 1.3 +@set UPDATED 25 May 1999 +@set EDITION 1.3.2 +@set VERSION 1.3.2 diff -druN libtool-1.3/doc/version.texi libtool-1.3.2/doc/version.texi --- libtool-1.3/doc/version.texi Thu Apr 29 10:30:59 1999 +++ libtool-1.3.2/doc/version.texi Tue May 25 21:31:49 1999 @@ -1,3 +1,3 @@ -@set UPDATED 29 April 1999 -@set EDITION 1.3 -@set VERSION 1.3 +@set UPDATED 25 May 1999 +@set EDITION 1.3.2 +@set VERSION 1.3.2 diff -druN libtool-1.3/install-sh libtool-1.3.2/install-sh --- libtool-1.3/install-sh Mon Apr 26 23:42:08 1999 +++ libtool-1.3.2/install-sh Wed Apr 14 09:14:14 1999 @@ -120,7 +120,7 @@ instcmd=: chmodcmd="" else - instcmd=mkdir + instcmd=$mkdirprog fi else @@ -163,8 +163,8 @@ # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' -' +defaultIFS=' + ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" diff -druN libtool-1.3/libltdl/Makefile.am libtool-1.3.2/libltdl/Makefile.am --- libtool-1.3/libltdl/Makefile.am Thu Apr 29 05:08:04 1999 +++ libtool-1.3.2/libltdl/Makefile.am Tue May 25 11:14:52 1999 @@ -26,3 +26,19 @@ $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck + +## 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 diff -druN libtool-1.3/libltdl/Makefile.in libtool-1.3.2/libltdl/Makefile.in --- libtool-1.3/libltdl/Makefile.in Thu Apr 29 10:28:34 1999 +++ libtool-1.3.2/libltdl/Makefile.in Tue May 25 21:31:13 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -59,8 +59,6 @@ POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ CC = @CC@ DLLTOOL = @DLLTOOL@ @@ -77,18 +75,13 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ - AUTOMAKE_OPTIONS = no-dependencies foreign -@INSTALL_LTDL_TRUE@include_HEADERS = \ -@INSTALL_LTDL_TRUE@ltdl.h -@INSTALL_LTDL_TRUE@lib_LTLIBRARIES = \ -@INSTALL_LTDL_TRUE@libltdl.la -@INSTALL_LTDL_FALSE@noinst_HEADERS = \ -@INSTALL_LTDL_FALSE@ltdl.h +@INSTALL_LTDL_TRUE@include_HEADERS = ltdl.h +@INSTALL_LTDL_TRUE@lib_LTLIBRARIES = libltdl.la +@INSTALL_LTDL_FALSE@noinst_HEADERS = ltdl.h -@CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = \ -@CONVENIENCE_LTDL_TRUE@libltdlc.la +@CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = libltdlc.la libltdl_la_SOURCES = ltdl.c libltdl_la_LDFLAGS = -version-info 1:1:1 @@ -96,7 +89,6 @@ libltdlc_la_SOURCES = ltdl.c libltdlc_la_LIBADD = $(LIBADD_DL) -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h @@ -109,34 +101,31 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libltdl_la_DEPENDENCIES = -am_libltdl_la_OBJECTS = ltdl.lo -libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS) +libltdl_la_OBJECTS = ltdl.lo libltdlc_la_LDFLAGS = libltdlc_la_DEPENDENCIES = -am_libltdlc_la_OBJECTS = ltdl.lo -libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) +libltdlc_la_OBJECTS = ltdl.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(include_HEADERS) $(noinst_HEADERS) -DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) ./stamp-h.in \ -COPYING.LIB Makefile.am Makefile.in acconfig.h acinclude.m4 aclocal.m4 \ -config.h.in configure configure.in +DIST_COMMON = README ./stamp-h.in COPYING.LIB Makefile.am Makefile.in \ +acconfig.h acinclude.m4 aclocal.m4 config.h.in configure configure.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) -OBJECTS = $(am_libltdl_la_OBJECTS) $(am_libltdlc_la_OBJECTS) +OBJECTS = $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .c .lo .o +.SUFFIXES: .S .c .lo .o .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile @@ -158,22 +147,18 @@ $(MAKE) stamp-h; \ else :; fi stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h stamp-hT - @echo timestamp > stamp-hT 2> /dev/null cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status - @mv stamp-hT stamp-h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/./stamp-h.in + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h.in; \ - $(MAKE) $(srcdir)/./stamp-h.in; \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi -$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null mostlyclean-hdr: @@ -205,8 +190,7 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done @@ -222,6 +206,12 @@ .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: -rm -f *.o core *.core @@ -233,7 +223,13 @@ maintainer-clean-compile: .c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c -o $@ $< + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo @@ -244,7 +240,6 @@ distclean-libtool: maintainer-clean-libtool: -ltdl.lo: libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) @@ -257,17 +252,14 @@ $(mkinstalldirs) $(DESTDIR)$(includedir) @list='$(include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ done uninstall-includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ - rm -f $(DESTDIR)$(includedir)/$$f; \ + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/$$p; \ done tags: TAGS @@ -307,7 +299,7 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ @@ -327,11 +319,11 @@ echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) @@ -340,7 +332,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -372,7 +364,7 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) @@ -433,8 +425,8 @@ maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ installcheck-am installcheck all-recursive-am install-exec-am \ install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all install-strip \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @@ -443,6 +435,19 @@ $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck + +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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -druN libtool-1.3/libltdl/acinclude.m4 libtool-1.3.2/libltdl/acinclude.m4 --- libtool-1.3/libltdl/acinclude.m4 Thu Apr 29 10:28:31 1999 +++ libtool-1.3.2/libltdl/acinclude.m4 Thu May 20 20:33:27 1999 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,5 +423,5 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff -druN libtool-1.3/libltdl/aclocal.m4 libtool-1.3.2/libltdl/aclocal.m4 --- libtool-1.3/libltdl/aclocal.m4 Thu Apr 29 10:28:32 1999 +++ libtool-1.3.2/libltdl/aclocal.m4 Tue May 25 21:31:12 1999 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl PARTICULAR PURPOSE. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -372,6 +372,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -395,9 +396,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -410,8 +413,8 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -424,8 +427,6 @@ AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -446,19 +447,6 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -dnl We check for tar when the user configures the end package. -dnl This is sad, since we only need this for "dist". However, -dnl there's no other good way to do it. We prefer GNU tar if -dnl we can find it. If we can't find a tar, it doesn't really matter. -AC_CHECK_PROGS(AMTAR, gnutar gtar tar) -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - dnl We have GNU tar. - AMTARFLAGS=o - fi -fi -AC_SUBST(AMTARFLAGS) AC_REQUIRE([AC_PROG_MAKE_SET])]) # diff -druN libtool-1.3/libltdl/configure libtool-1.3.2/libltdl/configure --- libtool-1.3/libltdl/configure Thu Apr 29 10:28:34 1999 +++ libtool-1.3.2/libltdl/configure Tue May 25 21:31:14 1999 @@ -717,7 +717,6 @@ fi - PACKAGE=libltdl VERSION=1.0 @@ -730,7 +729,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:734: checking for working aclocal" >&5 +echo "configure:733: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -743,7 +742,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:747: checking for working autoconf" >&5 +echo "configure:746: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -756,7 +755,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:760: checking for working automake" >&5 +echo "configure:759: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -769,7 +768,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:773: checking for working autoheader" >&5 +echo "configure:772: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -782,7 +781,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:786: checking for working makeinfo" >&5 +echo "configure:785: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -794,53 +793,12 @@ echo "$ac_t""missing" 1>&6 fi -for ac_prog in gnutar gtar tar -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:803: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AMTAR"; then - ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AMTAR="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AMTAR="$ac_cv_prog_AMTAR" -if test -n "$AMTAR"; then - echo "$ac_t""$AMTAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AMTAR" && break -done - -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - AMTARFLAGS=o - fi -fi - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:844: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:802: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -866,7 +824,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:870: checking for $ac_word" >&5 +echo "configure:828: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -896,7 +854,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:900: checking for $ac_word" >&5 +echo "configure:858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -947,7 +905,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:951: checking for $ac_word" >&5 +echo "configure:909: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +937,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:983: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -990,12 +948,12 @@ cat > conftest.$ac_ext << EOF -#line 994 "configure" +#line 952 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1021,12 +979,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1025: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:983: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1030: checking whether we are using GNU C" >&5 +echo "configure:988: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +993,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1054,7 +1012,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1058: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1016: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1086,12 +1044,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1090: checking for working const" >&5 +echo "configure:1048: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1161,21 +1119,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1165: checking for inline" >&5 +echo "configure:1123: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1276,7 +1234,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1280: checking host system type" >&5 +echo "configure:1238: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1297,7 +1255,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1301: checking build system type" >&5 +echo "configure:1259: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1317,7 +1275,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1321: checking for $ac_word" >&5 +echo "configure:1279: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1356,7 +1314,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1360: checking for ld used by GCC" >&5 +echo "configure:1318: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1380,10 +1338,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1384: checking for GNU ld" >&5 +echo "configure:1342: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1387: checking for non-GNU ld" >&5 +echo "configure:1345: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1419,7 +1377,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1423: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1381: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1435,7 +1393,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1439: checking for BSD-compatible nm" >&5 +echo "configure:1397: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1472,7 +1430,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1476: checking whether ln -s works" >&5 +echo "configure:1434: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1516,8 +1474,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1520 "configure"' > conftest.$ac_ext - if { (eval echo configure:1521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1478 "configure"' > conftest.$ac_ext + if { (eval echo configure:1479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1538,19 +1496,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1542: checking whether the C compiler needs -belf" >&5 +echo "configure:1500: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1685,7 +1643,7 @@ rm -f conftest echo $ac_n "checking which extension is used for shared libraries""... $ac_c" 1>&6 -echo "configure:1689: checking which extension is used for shared libraries" >&5 +echo "configure:1647: checking which extension is used for shared libraries" >&5 if eval "test \"`echo '$''{'libltdl_cv_shlibext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1670,7 @@ fi echo $ac_n "checking which variable specifies run-time library path""... $ac_c" 1>&6 -echo "configure:1716: checking which variable specifies run-time library path" >&5 +echo "configure:1674: checking which variable specifies run-time library path" >&5 if eval "test \"`echo '$''{'libltdl_cv_shlibpath_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1728,7 +1686,7 @@ fi echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:1732: checking for objdir" >&5 +echo "configure:1690: checking for objdir" >&5 if eval "test \"`echo '$''{'libltdl_cv_objdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1743,7 +1701,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1747: checking how to run the C preprocessor" >&5 +echo "configure:1705: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1758,13 +1716,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1726: \"$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 : @@ -1775,13 +1733,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1743: \"$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 : @@ -1792,13 +1750,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1760: \"$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 : @@ -1823,12 +1781,12 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1827: checking for ANSI C header files" >&5 +echo "configure:1785: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1836,7 +1794,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1798: \"$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 rm -rf conftest* @@ -1853,7 +1811,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1871,7 +1829,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1892,7 +1850,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1903,7 +1861,7 @@ exit (0); } EOF -if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1930,17 +1888,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1934: checking for $ac_hdr" >&5 +echo "configure:1892: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1902: \"$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 rm -rf conftest* @@ -1970,17 +1928,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1974: checking for $ac_hdr" >&5 +echo "configure:1932: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1942: \"$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 rm -rf conftest* @@ -2009,12 +1967,12 @@ for ac_func in strchr index do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2013: checking for $ac_func" >&5 +echo "configure:1971: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2064,12 +2022,12 @@ for ac_func in strrchr rindex do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2068: checking for $ac_func" >&5 +echo "configure:2026: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2118,7 +2076,7 @@ echo $ac_n "checking whether libtool supports -dlopen/-dlpreopen""... $ac_c" 1>&6 -echo "configure:2122: checking whether libtool supports -dlopen/-dlpreopen" >&5 +echo "configure:2080: checking whether libtool supports -dlopen/-dlpreopen" >&5 if eval "test \"`echo '$''{'libltdl_cv_preloaded_symbols'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2139,57 +2097,8 @@ fi LIBADD_DL= -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:2144: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* 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. */ -char dlopen(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -dlopen(); -#endif - -; return 0; } -EOF -if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_LIBDL 1 -EOF - -else - echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2193: checking for dlopen in -ldl" >&5 +echo "configure:2102: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2197,7 +2106,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2229,54 +2138,66 @@ LIBADD_DL="-ldl" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:2234: checking for dld_link in -ldld" >&5 -ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +echo "configure:2143: checking for dlopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* 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. */ -char dld_link(); +char dlopen(); int main() { -dld_link() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +dlopen(); +#endif + ; return 0; } EOF -if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_dlopen=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_dlopen=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define HAVE_DLD 1 +#define HAVE_LIBDL 1 EOF - LIBADD_DL="-ldld" + else echo "$ac_t""no" 1>&6 +fi + +fi + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:2275: checking for shl_load" >&5 +echo "configure:2196: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -2320,7 +2241,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2324: checking for shl_load in -ldld" >&5 +echo "configure:2245: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2328,7 +2249,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2357,34 +2278,70 @@ cat >> confdefs.h <<\EOF #define HAVE_SHL_LOAD 1 EOF - LIBADD_DL="-ldld" + LIBADD_DL="$LIBADD_DL -ldld" else echo "$ac_t""no" 1>&6 fi - fi -fi +echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +echo "configure:2290: checking for dld_link in -ldld" >&5 +ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldld $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DLD 1 +EOF +test "x$ac_cv_lib_dld_shl_load" = yes || LIBADD_DL="$LIBADD_DL -ldld" +else + echo "$ac_t""no" 1>&6 +fi -if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = yes; then +if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then LIBS_SAVE="$LIBS" LIBS="$LIBS $LIBADD_DL" for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2383: checking for $ac_func" >&5 +echo "configure:2340: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2436,7 +2393,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:2440: checking command to parse $NM output" >&5 +echo "configure:2397: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2499,11 +2456,11 @@ int main(){nm_test_var='a';nm_test_func;return 0;} EOF - if { (eval echo configure:2503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:2507: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:2464: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # Try sorting and uniquifying the output. if sort "$ac_nlist" | uniq > "$ac_nlist"T; then @@ -2555,7 +2512,7 @@ ac_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_pipe_works=yes else echo "configure: failed program was:" >&5 @@ -2601,7 +2558,7 @@ echo "$ac_t""$ac_result" 1>&6 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:2605: checking for _ prefix in compiled symbols" >&5 +echo "configure:2562: checking for _ prefix in compiled symbols" >&5 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2610,10 +2567,10 @@ void nm_test_func(){} int main(){nm_test_func;return 0;} EOF -if { (eval echo configure:2614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:2617: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:2574: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # See whether the symbols have a leading underscore. if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then ac_cv_sys_symbol_underscore=yes @@ -2641,7 +2598,7 @@ if test x"$ac_cv_func_dlopen" = xyes || test x"$ac_cv_lib_dl_dlopen" = xyes ; then echo $ac_n "checking whether we have to add an underscore for dlsym""... $ac_c" 1>&6 -echo "configure:2645: checking whether we have to add an underscore for dlsym" >&5 +echo "configure:2602: checking whether we have to add an underscore for dlsym" >&5 if eval "test \"`echo '$''{'libltdl_cv_need_uscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2650,7 +2607,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then libltdl_cv_need_uscore=no else @@ -2865,8 +2822,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g -s%@AMTAR@%$AMTAR%g -s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g diff -druN libtool-1.3/libltdl/configure.in libtool-1.3.2/libltdl/configure.in --- libtool-1.3/libltdl/configure.in Thu Apr 29 05:08:04 1999 +++ libtool-1.3.2/libltdl/configure.in Sun May 23 07:27:57 1999 @@ -88,15 +88,15 @@ fi LIBADD_DL= -AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1)], -[AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], -[AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD, 1) LIBADD_DL="-ldld"], -[AC_CHECK_FUNC(shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1)], -[AC_CHECK_LIB(dld, shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1) LIBADD_DL="-ldld"])] -)])])]) +AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], +[AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1)])]) +AC_CHECK_FUNC(shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1)], +[AC_CHECK_LIB(dld, shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1) LIBADD_DL="$LIBADD_DL -ldld"])]) +AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD, 1)dnl +test "x$ac_cv_lib_dld_shl_load" = yes || LIBADD_DL="$LIBADD_DL -ldld"]) AC_SUBST(LIBADD_DL) -if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = yes; then +if test "x$ac_cv_func_dlopen" = xyes || test "x$ac_cv_lib_dl_dlopen" = xyes; then LIBS_SAVE="$LIBS" LIBS="$LIBS $LIBADD_DL" AC_CHECK_FUNCS(dlerror) diff -druN libtool-1.3/libltdl/ltdl.c libtool-1.3.2/libltdl/ltdl.c --- libtool-1.3/libltdl/ltdl.c Mon Apr 12 16:41:19 1999 +++ libtool-1.3.2/libltdl/ltdl.c Fri May 21 09:04:38 1999 @@ -104,17 +104,17 @@ static const char *last_error = 0; -lt_ptr_t (*lt_dlmalloc) __P((size_t size)) = (lt_ptr_t(*)__P((size_t)))malloc; -void (*lt_dlfree) __P((lt_ptr_t ptr)) = (void(*)__P((lt_ptr_t)))free; +lt_ptr_t (*lt_dlmalloc) LTDL_PARAMS((size_t size)) = (lt_ptr_t(*)LTDL_PARAMS((size_t)))malloc; +void (*lt_dlfree) LTDL_PARAMS((lt_ptr_t ptr)) = (void(*)LTDL_PARAMS((lt_ptr_t)))free; typedef struct lt_dltype_t { struct lt_dltype_t *next; const char *sym_prefix; /* prefix for symbols */ - int (*mod_init) __P((void)); - int (*mod_exit) __P((void)); - int (*lib_open) __P((lt_dlhandle handle, const char *filename)); - int (*lib_close) __P((lt_dlhandle handle)); - lt_ptr_t (*find_sym) __P((lt_dlhandle handle, const char *symbol)); + int (*mod_init) LTDL_PARAMS((void)); + int (*mod_exit) LTDL_PARAMS((void)); + int (*lib_open) LTDL_PARAMS((lt_dlhandle handle, const char *filename)); + int (*lib_close) LTDL_PARAMS((lt_dlhandle handle)); + lt_ptr_t (*find_sym) LTDL_PARAMS((lt_dlhandle handle, const char *symbol)); } lt_dltype_t; #define LTDL_TYPE_TOP 0 @@ -246,19 +246,19 @@ #endif static int -dl_init __P((void)) +sys_dl_init LTDL_PARAMS((void)) { return 0; } static int -dl_exit __P((void)) +sys_dl_exit LTDL_PARAMS((void)) { return 0; } static int -dl_open (handle, filename) +sys_dl_open (handle, filename) lt_dlhandle handle; const char *filename; { @@ -275,7 +275,7 @@ } static int -dl_close (handle) +sys_dl_close (handle) lt_dlhandle handle; { if (dlclose(handle->handle) != 0) { @@ -290,7 +290,7 @@ } static lt_ptr_t -dl_sym (handle, symbol) +sys_dl_sym (handle, symbol) lt_dlhandle handle; const char *symbol; { @@ -308,15 +308,15 @@ static lt_dltype_t #ifdef NEED_USCORE -dl = { LTDL_TYPE_TOP, "_", dl_init, dl_exit, - dl_open, dl_close, dl_sym }; +sys_dl = { LTDL_TYPE_TOP, "_", sys_dl_init, sys_dl_exit, + sys_dl_open, sys_dl_close, sys_dl_sym }; #else -dl = { LTDL_TYPE_TOP, 0, dl_init, dl_exit, - dl_open, dl_close, dl_sym }; +sys_dl = { LTDL_TYPE_TOP, 0, sys_dl_init, sys_dl_exit, + sys_dl_open, sys_dl_close, sys_dl_sym }; #endif #undef LTDL_TYPE_TOP -#define LTDL_TYPE_TOP &dl +#define LTDL_TYPE_TOP &sys_dl #endif @@ -364,19 +364,19 @@ #define LTDL_BIND_FLAGS (BIND_IMMEDIATE | BIND_NONFATAL | BIND_VERBOSE | DYNAMIC_PATH) static int -shl_init __P((void)) +sys_shl_init LTDL_PARAMS((void)) { return 0; } static int -shl_exit __P((void)) +sys_shl_exit LTDL_PARAMS((void)) { return 0; } static int -shl_open (handle, filename) +sys_shl_open (handle, filename) lt_dlhandle handle; const char *filename; { @@ -389,7 +389,7 @@ } static int -shl_close (handle) +sys_shl_close (handle) lt_dlhandle handle; { if (shl_unload((shl_t) (handle->handle)) != 0) { @@ -400,7 +400,7 @@ } static lt_ptr_t -shl_sym (handle, symbol) +sys_shl_sym (handle, symbol) lt_dlhandle handle; const char *symbol; { @@ -416,11 +416,11 @@ static lt_dltype_t -shl = { LTDL_TYPE_TOP, 0, shl_init, shl_exit, - shl_open, shl_close, shl_sym }; +sys_shl = { LTDL_TYPE_TOP, 0, sys_shl_init, sys_shl_exit, + sys_shl_open, sys_shl_close, sys_shl_sym }; #undef LTDL_TYPE_TOP -#define LTDL_TYPE_TOP &shl +#define LTDL_TYPE_TOP &sys_shl #endif @@ -433,19 +433,19 @@ #endif static int -dld_init __P((void)) +sys_dld_init LTDL_PARAMS((void)) { return 0; } static int -dld_exit __P((void)) +sys_dld_exit LTDL_PARAMS((void)) { return 0; } static int -dld_open (handle, filename) +sys_dld_open (handle, filename) lt_dlhandle handle; const char *filename; { @@ -463,7 +463,7 @@ } static int -dld_close (handle) +sys_dld_close (handle) lt_dlhandle handle; { if (dld_unlink_by_file((char*)(handle->handle), 1) != 0) { @@ -475,7 +475,7 @@ } static lt_ptr_t -dld_sym (handle, symbol) +sys_dld_sym (handle, symbol) lt_dlhandle handle; const char *symbol; { @@ -488,11 +488,11 @@ static lt_dltype_t -dld = { LTDL_TYPE_TOP, 0, dld_init, dld_exit, - dld_open, dld_close, dld_sym }; +sys_dld = { LTDL_TYPE_TOP, 0, sys_dld_init, sys_dld_exit, + sys_dld_open, sys_dld_close, sys_dld_sym }; #undef LTDL_TYPE_TOP -#define LTDL_TYPE_TOP &dld +#define LTDL_TYPE_TOP &sys_dld #endif @@ -503,19 +503,19 @@ #include static int -wll_init __P((void)) +sys_wll_init LTDL_PARAMS((void)) { return 0; } static int -wll_exit __P((void)) +sys_wll_exit LTDL_PARAMS((void)) { return 0; } static int -wll_open (handle, filename) +sys_wll_open (handle, filename) lt_dlhandle handle; const char *filename; { @@ -528,7 +528,7 @@ } static int -wll_close (handle) +sys_wll_close (handle) lt_dlhandle handle; { if (FreeLibrary(handle->handle) != 0) { @@ -539,7 +539,7 @@ } static lt_ptr_t -wll_sym (handle, symbol) +sys_wll_sym (handle, symbol) lt_dlhandle handle; const char *symbol; { @@ -552,11 +552,11 @@ static lt_dltype_t -wll = { LTDL_TYPE_TOP, 0, wll_init, wll_exit, - wll_open, wll_close, wll_sym }; +sys_wll = { LTDL_TYPE_TOP, 0, sys_wll_init, sys_wll_exit, + sys_wll_open, sys_wll_close, sys_wll_sym }; #undef LTDL_TYPE_TOP -#define LTDL_TYPE_TOP &wll +#define LTDL_TYPE_TOP &sys_wll #endif @@ -567,19 +567,19 @@ #include static int -bedl_init __P((void)) +sys_bedl_init LTDL_PARAMS((void)) { return 0; } static int -bedl_exit __P((void)) +sys_bedl_exit LTDL_PARAMS((void)) { return 0; } static int -bedl_open (handle, filename) +sys_bedl_open (handle, filename) lt_dlhandle handle; const char *filename; { @@ -602,7 +602,7 @@ } static int -bedl_close (handle) +sys_bedl_close (handle) lt_dlhandle handle; { if (unload_add_on((image_id)handle->handle) != B_OK) { @@ -613,7 +613,7 @@ } static lt_ptr_t -bedl_sym (handle, symbol) +sys_bedl_sym (handle, symbol) lt_dlhandle handle; const char *symbol; { @@ -630,11 +630,11 @@ static lt_dltype_t -bedl = { LTDL_TYPE_TOP, 0, bedl_init, bedl_exit, - bedl_open, bedl_close, bedl_sym }; +sys_bedl = { LTDL_TYPE_TOP, 0, sys_bedl_init, sys_bedl_exit, + sys_bedl_open, sys_bedl_close, sys_bedl_sym }; #undef LTDL_TYPE_TOP -#define LTDL_TYPE_TOP &bedl +#define LTDL_TYPE_TOP &sys_bedl #endif @@ -649,7 +649,7 @@ static lt_dlsymlists_t *preloaded_symbols = 0; static int -presym_init __P((void)) +presym_init LTDL_PARAMS((void)) { preloaded_symbols = 0; if (default_preloaded_symbols) @@ -658,7 +658,7 @@ } static int -presym_free_symlists __P((void)) +presym_free_symlists LTDL_PARAMS((void)) { lt_dlsymlists_t *lists = preloaded_symbols; @@ -673,7 +673,7 @@ } static int -presym_exit __P((void)) +presym_exit LTDL_PARAMS((void)) { presym_free_symlists(); return 0; @@ -783,7 +783,7 @@ #undef LTDL_TYPE_TOP int -lt_dlinit __P((void)) +lt_dlinit LTDL_PARAMS((void)) { /* initialize libltdl */ lt_dltype_t **type = &types; @@ -834,7 +834,7 @@ } int -lt_dlexit __P((void)) +lt_dlexit LTDL_PARAMS((void)) { /* shut down libltdl */ lt_dltype_t *type = types; @@ -1518,7 +1518,7 @@ } const char * -lt_dlerror __P((void)) +lt_dlerror LTDL_PARAMS((void)) { const char *error = last_error; @@ -1571,7 +1571,7 @@ } const char * -lt_dlgetsearchpath __P((void)) +lt_dlgetsearchpath LTDL_PARAMS((void)) { return user_search_path; } diff -druN libtool-1.3/libltdl/ltdl.h libtool-1.3.2/libltdl/ltdl.h --- libtool-1.3/libltdl/ltdl.h Sat Mar 27 13:52:00 1999 +++ libtool-1.3.2/libltdl/ltdl.h Fri May 21 09:04:38 1999 @@ -40,16 +40,16 @@ # define __END_DECLS /* empty */ #endif -/* __P is a macro used to wrap function prototypes, so that compilers +/* LTDL_PARAMS is a macro used to wrap function prototypes, so that compilers that don't understand ANSI C prototypes still work, and ANSI C compilers can issue warnings about type mismatches. */ -#undef __P +#undef LTDL_PARAMS #undef lt_ptr_t #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus) -# define __P(protos) protos +# define LTDL_PARAMS(protos) protos # define lt_ptr_t void* #else -# define __P(protos) () +# define LTDL_PARAMS(protos) () # define lt_ptr_t char* #endif @@ -67,24 +67,24 @@ } lt_dlsymlist; __BEGIN_DECLS -extern int lt_dlinit __P((void)); -extern int lt_dlpreload __P((const lt_dlsymlist *preloaded)); -extern int lt_dlpreload_default __P((const lt_dlsymlist *preloaded)); -extern int lt_dlexit __P((void)); -extern lt_dlhandle lt_dlopen __P((const char *filename)); -extern lt_dlhandle lt_dlopenext __P((const char *filename)); -extern int lt_dlclose __P((lt_dlhandle handle)); -extern lt_ptr_t lt_dlsym __P((lt_dlhandle handle, const char *name)); -extern const char *lt_dlerror __P((void)); -extern int lt_dladdsearchdir __P((const char *search_dir)); -extern int lt_dlsetsearchpath __P((const char *search_path)); -extern const char *lt_dlgetsearchpath __P((void)); +extern int lt_dlinit LTDL_PARAMS((void)); +extern int lt_dlpreload LTDL_PARAMS((const lt_dlsymlist *preloaded)); +extern int lt_dlpreload_default LTDL_PARAMS((const lt_dlsymlist *preloaded)); +extern int lt_dlexit LTDL_PARAMS((void)); +extern lt_dlhandle lt_dlopen LTDL_PARAMS((const char *filename)); +extern lt_dlhandle lt_dlopenext LTDL_PARAMS((const char *filename)); +extern int lt_dlclose LTDL_PARAMS((lt_dlhandle handle)); +extern lt_ptr_t lt_dlsym LTDL_PARAMS((lt_dlhandle handle, const char *name)); +extern const char *lt_dlerror LTDL_PARAMS((void)); +extern int lt_dladdsearchdir LTDL_PARAMS((const char *search_dir)); +extern int lt_dlsetsearchpath LTDL_PARAMS((const char *search_path)); +extern const char *lt_dlgetsearchpath LTDL_PARAMS((void)); extern const lt_dlsymlist lt_preloaded_symbols[]; #define LTDL_SET_PRELOADED_SYMBOLS() lt_dlpreload_default(lt_preloaded_symbols) -extern lt_ptr_t (*lt_dlmalloc)__P((size_t size)); -extern void (*lt_dlfree)__P((lt_ptr_t ptr)); +extern lt_ptr_t (*lt_dlmalloc)LTDL_PARAMS((size_t size)); +extern void (*lt_dlfree)LTDL_PARAMS((lt_ptr_t ptr)); __END_DECLS diff -druN libtool-1.3/libltdl/stamp-h.in libtool-1.3.2/libltdl/stamp-h.in --- libtool-1.3/libltdl/stamp-h.in Thu Apr 29 10:28:34 1999 +++ libtool-1.3.2/libltdl/stamp-h.in Tue May 25 21:31:44 1999 @@ -0,0 +1 @@ +timestamp diff -druN libtool-1.3/libtool.m4 libtool-1.3.2/libtool.m4 --- libtool-1.3/libtool.m4 Thu Apr 29 05:13:34 1999 +++ libtool-1.3.2/libtool.m4 Thu May 20 20:33:02 1999 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,5 +423,5 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff -druN libtool-1.3/ltconfig libtool-1.3.2/ltconfig --- libtool-1.3/ltconfig Thu Apr 29 10:30:36 1999 +++ libtool-1.3.2/ltconfig Tue May 25 21:31:25 1999 @@ -169,8 +169,8 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool -VERSION=1.3 -TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +VERSION=1.3.2 +TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)" 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" @@ -650,6 +650,11 @@ # like `-m68040'. pic_flag='-m68020 -resident32 -malways-restore-a4' ;; + sysv4*MP*) + if test -d /usr/nec; then + pic_flag=-Kconform_pic + fi + ;; *) pic_flag='-fPIC' ;; @@ -713,7 +718,12 @@ pic_flag='-pic' link_static_flag='-Bstatic' ;; - + sysv4*MP*) + if test -d /usr/nec ;then + pic_flag='-Kconform_pic' + link_static_flag='-Bstatic' + fi + ;; *) can_build_shared=no ;; @@ -729,8 +739,8 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pic_flag -DPIC" - echo "$progname:732: checking if $compiler PIC flag $pic_flag works" >&5 - if { (eval echo $progname:733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + echo "$progname:742: checking if $compiler PIC flag $pic_flag works" >&5 + if { (eval echo $progname:743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then # Append any warnings to the config.log. cat conftest.err 1>&5 @@ -782,8 +792,8 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.o" -echo "$progname:785: checking if $compiler supports -c -o file.o" >&5 -if { (eval echo $progname:786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then +echo "$progname:795: checking if $compiler supports -c -o file.o" >&5 +if { (eval echo $progname:796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -815,8 +825,8 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" - echo "$progname:818: checking if $compiler supports -c -o file.lo" >&5 -if { (eval echo $progname:819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then + echo "$progname:828: checking if $compiler supports -c -o file.lo" >&5 +if { (eval echo $progname:829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -867,8 +877,8 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" - echo "$progname:870: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - if { (eval echo $progname:871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + echo "$progname:880: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + if { (eval echo $progname:881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -911,8 +921,8 @@ echo 'main(){return(0);}' > conftest.c save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $link_static_flag" -echo "$progname:914: checking if $compiler static flag $link_static_flag works" >&5 -if { (eval echo $progname:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +echo "$progname:924: checking if $compiler static flag $link_static_flag works" >&5 +if { (eval echo $progname:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then echo "$ac_t$link_static_flag" 1>&6 else echo "$ac_t"none 1>&6 @@ -944,7 +954,7 @@ if test "$with_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 - echo "$progname:947: checking for ld used by GCC" >&5 + echo "$progname:957: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -968,10 +978,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld... $ac_c" 1>&6 - echo "$progname:971: checking for GNU ld" >&5 + echo "$progname:981: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 - echo "$progname:974: checking for non-GNU ld" >&5 + echo "$progname:984: checking for non-GNU ld" >&5 fi if test -z "$LD"; then @@ -1151,6 +1161,27 @@ fi ;; + solaris*) + if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $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 + ld_shlibs=no + fi + ;; + sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' wlarc= @@ -1172,7 +1203,15 @@ runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + case $host_os in + cygwin* | mingw*) + # dlltool doesn't understand --whole-archive et. al. + whole_archive_flag_spec= + ;; + *) + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + ;; + esac fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -1362,7 +1401,7 @@ case "$host_os" in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac ;; @@ -1399,6 +1438,17 @@ hardcode_shlibpath_var=no ;; + 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 ;; @@ -1504,11 +1554,11 @@ main(){nm_test_var='a';nm_test_func();return(0);} EOF - echo "$progname:1507: checking if global_symbol_pipe works" >&5 - if { (eval echo $progname:1508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + echo "$progname:1557: checking if global_symbol_pipe works" >&5 + if { (eval echo $progname:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:1511: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:1561: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1560,7 +1610,7 @@ save_CFLAGS="$CFLAGS" LIBS="conftstm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 @@ -1694,6 +1744,7 @@ library_names_spec='${libname}.so' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH + deplibs_check_method=pass_all lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -1960,6 +2011,15 @@ shlibpath_var=LD_LIBRARY_PATH ;; +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' + soname_spec='$libname.so.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + *) dynamic_linker=no ;; @@ -2059,90 +2119,89 @@ else if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "$progname:2063: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "$progname:2123: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_dlopen=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_dlopen=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "$progname:2108: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +echo "$progname:2160: checking for dlopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* 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. */ char dlopen(); int main() { -dlopen() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +dlopen(); +#endif + ; return 0; } EOF -if { (eval echo $progname:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_dlopen=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_dlopen=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen="dlopen" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "$progname:2145: checking for dld_link in -ldld" >&5 +echo "$progname:2204: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2150,7 +2209,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2179,12 +2238,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "$progname:2182: checking for shl_load" >&5 +echo "$progname:2241: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2206,7 +2265,7 @@ ; return 0; } EOF -if { (eval echo $progname:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -2224,7 +2283,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "$progname:2227: checking for shl_load in -ldld" >&5 +echo "$progname:2286: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2232,7 +2291,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2286,17 +2345,17 @@ for ac_hdr in dlfcn.h; do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "$progname:2289: checking for $ac_hdr" >&5 +echo "$progname:2348: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int fnord = 0; EOF ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo $progname:2299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo $progname:2358: \"$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 rm -rf conftest* @@ -2324,7 +2383,7 @@ LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2327: checking whether a program can dlopen itself" >&5 +echo "$progname:2386: checking whether a program can dlopen itself" >&5 if test "${lt_cv_dlopen_self+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2332,7 +2391,7 @@ lt_cv_dlopen_self=cross else cat > conftest.c < @@ -2378,7 +2437,7 @@ if(ptr1 || ptr2) exit(0); } exit(1); } EOF -if { (eval echo $progname:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self=yes else @@ -2397,7 +2456,7 @@ if test "$lt_cv_dlopen_self" = yes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2400: checking whether a statically linked program can dlopen itself" >&5 +echo "$progname:2459: checking whether a statically linked program can dlopen itself" >&5 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2405,7 +2464,7 @@ lt_cv_dlopen_self_static=cross else cat > conftest.c < @@ -2451,7 +2510,7 @@ if(ptr1 || ptr2) exit(0); } exit(1); } EOF -if { (eval echo $progname:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self_static=yes else diff -druN libtool-1.3/ltconfig.in libtool-1.3.2/ltconfig.in --- libtool-1.3/ltconfig.in Thu Apr 29 05:03:40 1999 +++ libtool-1.3.2/ltconfig.in Tue May 25 19:12:12 1999 @@ -650,6 +650,11 @@ # like `-m68040'. pic_flag='-m68020 -resident32 -malways-restore-a4' ;; + sysv4*MP*) + if test -d /usr/nec; then + pic_flag=-Kconform_pic + fi + ;; *) pic_flag='-fPIC' ;; @@ -713,7 +718,12 @@ pic_flag='-pic' link_static_flag='-Bstatic' ;; - + sysv4*MP*) + if test -d /usr/nec ;then + pic_flag='-Kconform_pic' + link_static_flag='-Bstatic' + fi + ;; *) can_build_shared=no ;; @@ -1151,6 +1161,27 @@ fi ;; + solaris*) + if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $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 + ld_shlibs=no + fi + ;; + sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' wlarc= @@ -1172,7 +1203,15 @@ runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + case $host_os in + cygwin* | mingw*) + # dlltool doesn't understand --whole-archive et. al. + whole_archive_flag_spec= + ;; + *) + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + ;; + esac fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -1362,7 +1401,7 @@ case "$host_os" in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac ;; @@ -1399,6 +1438,17 @@ hardcode_shlibpath_var=no ;; + 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 ;; @@ -1694,6 +1744,7 @@ library_names_spec='${libname}.so' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH + deplibs_check_method=pass_all lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -1960,6 +2011,15 @@ shlibpath_var=LD_LIBRARY_PATH ;; +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' + soname_spec='$libname.so.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + *) dynamic_linker=no ;; @@ -2059,86 +2119,85 @@ else if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "$progname:@LINENO@: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "$progname:@LINENO@: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < /* 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. */ char dlopen(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -dlopen(); -#endif - +dlopen() ; return 0; } EOF if { (eval echo $progname:@LINENO@: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_dlopen=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_dlopen=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "$progname:@LINENO@: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +echo "$progname:@LINENO@: checking for dlopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* 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. */ char dlopen(); int main() { -dlopen() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +dlopen(); +#endif + ; return 0; } EOF if { (eval echo $progname:@LINENO@: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_dlopen=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_dlopen=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen="dlopen" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 diff -druN libtool-1.3/ltmain.in libtool-1.3.2/ltmain.in --- libtool-1.3/ltmain.in Thu Apr 29 09:01:59 1999 +++ libtool-1.3.2/ltmain.in Tue May 25 19:22:01 1999 @@ -466,6 +466,7 @@ command="$command -o $output_obj" fi + $run $rm "$output_obj" $show "$command" if $run eval "$command"; then : else @@ -545,6 +546,7 @@ # Suppress compiler output if we already did a PIC compilation. command="$command$suppress_output" + $run $rm "$output_obj" $show "$command" if $run eval "$command"; then : else @@ -1021,8 +1023,9 @@ *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 + $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 + absdir="$dir" fi dir="$absdir" ;; @@ -1294,8 +1297,9 @@ *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 + $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 + absdir="$dir" fi ;; esac @@ -1902,7 +1906,7 @@ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. - if ls -lLd "$potlib" 2>/dev/null \ + if ls -lLd "$potent_lib" 2>/dev/null \ | grep " -> " >/dev/null; then continue fi diff -druN libtool-1.3/ltmain.sh libtool-1.3.2/ltmain.sh --- libtool-1.3/ltmain.sh Thu Apr 29 10:30:37 1999 +++ libtool-1.3.2/ltmain.sh Tue May 25 21:31:24 1999 @@ -54,8 +54,8 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.3 -TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +VERSION=1.3.2 +TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)" default_mode= help="Try \`$progname --help' for more information." @@ -466,6 +466,7 @@ command="$command -o $output_obj" fi + $run $rm "$output_obj" $show "$command" if $run eval "$command"; then : else @@ -545,6 +546,7 @@ # Suppress compiler output if we already did a PIC compilation. command="$command$suppress_output" + $run $rm "$output_obj" $show "$command" if $run eval "$command"; then : else @@ -1021,8 +1023,9 @@ *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 + $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 + absdir="$dir" fi dir="$absdir" ;; @@ -1294,8 +1297,9 @@ *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 + $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 + absdir="$dir" fi ;; esac @@ -1902,7 +1906,7 @@ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. - if ls -lLd "$potlib" 2>/dev/null \ + if ls -lLd "$potent_lib" 2>/dev/null \ | grep " -> " >/dev/null; then continue fi diff -druN libtool-1.3/mdemo/Makefile.in libtool-1.3.2/mdemo/Makefile.in --- libtool-1.3/mdemo/Makefile.in Thu Apr 29 10:28:36 1999 +++ libtool-1.3.2/mdemo/Makefile.in Tue May 25 21:31:17 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -59,8 +59,6 @@ POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ CC = @CC@ DLLTOOL = @DLLTOOL@ @@ -79,7 +77,6 @@ STATIC = @STATIC@ VERSION = @VERSION@ - AUTOMAKE_OPTIONS = no-dependencies foreign INCLUDES = -I$(srcdir)/../libltdl @@ -103,8 +100,7 @@ # Create a version of mdemo that does dlopen. mdemo_SOURCES = main.c mdemo_LDFLAGS = -export-dynamic -mdemo_LDADD = @LIBLTDL@ "-dlopen" self \ - "-dlopen" foo1.la "-dlopen" libfoo2.la +mdemo_LDADD = @LIBLTDL@ "-dlopen" self "-dlopen" foo1.la "-dlopen" libfoo2.la mdemo_DEPENDENCIES = @LIBLTDL@ foo1.la libfoo2.la @@ -113,7 +109,6 @@ mdemo_static_LDFLAGS = $(STATIC) $(mdemo_LDFLAGS) mdemo_static_LDADD = $(mdemo_LDADD) mdemo_static_DEPENDENCIES = $(mdemo_DEPENDENCIES) -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_CLEAN_FILES = @@ -125,40 +120,35 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ foo1_la_DEPENDENCIES = -am_foo1_la_OBJECTS = foo1.lo -foo1_la_OBJECTS = $(am_foo1_la_OBJECTS) +foo1_la_OBJECTS = foo1.lo libfoo2_la_DEPENDENCIES = -am_libfoo2_la_OBJECTS = foo2.lo -libfoo2_la_OBJECTS = $(am_libfoo2_la_OBJECTS) +libfoo2_la_OBJECTS = foo2.lo bin_PROGRAMS = mdemo$(EXEEXT) mdemo.static PROGRAMS = $(bin_PROGRAMS) -am_mdemo_OBJECTS = main.o -mdemo_OBJECTS = $(am_mdemo_OBJECTS) -am_mdemo_static_OBJECTS = main.o -mdemo_static_OBJECTS = $(am_mdemo_static_OBJECTS) +mdemo_OBJECTS = main.o +mdemo_static_OBJECTS = main.o CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(foo1_la_SOURCES) $(libfoo2_la_SOURCES) \ -$(mdemo_SOURCES) $(mdemo_static_SOURCES) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) -DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in \ -acinclude.m4 aclocal.m4 configure configure.in +DIST_COMMON = README Makefile.am Makefile.in acinclude.m4 aclocal.m4 \ +configure configure.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best SOURCES = $(foo1_la_SOURCES) $(libfoo2_la_SOURCES) $(mdemo_SOURCES) $(mdemo_static_SOURCES) -OBJECTS = $(am_foo1_la_OBJECTS) $(am_libfoo2_la_OBJECTS) $(am_mdemo_OBJECTS) $(am_mdemo_static_OBJECTS) +OBJECTS = $(foo1_la_OBJECTS) $(libfoo2_la_OBJECTS) $(mdemo_OBJECTS) $(mdemo_static_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .c .lo .o +.SUFFIXES: .S .c .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile @@ -195,14 +185,19 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: -rm -f *.o core *.core @@ -214,7 +209,13 @@ maintainer-clean-compile: .c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c -o $@ $< + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo @@ -225,11 +226,9 @@ distclean-libtool: maintainer-clean-libtool: -foo1.lo: foo1.la: $(foo1_la_OBJECTS) $(foo1_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(foo1_la_LDFLAGS) $(foo1_la_OBJECTS) $(foo1_la_LIBADD) $(LIBS) -foo2.lo: libfoo2.la: $(libfoo2_la_OBJECTS) $(libfoo2_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libfoo2_la_LDFLAGS) $(libfoo2_la_OBJECTS) $(libfoo2_la_LIBADD) $(LIBS) @@ -248,20 +247,16 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -main.o: mdemo$(EXEEXT): $(mdemo_OBJECTS) $(mdemo_DEPENDENCIES) @rm -f mdemo$(EXEEXT) @@ -308,7 +303,7 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ @@ -328,11 +323,11 @@ echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - $(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) @@ -341,7 +336,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -370,7 +365,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) @@ -425,7 +420,7 @@ maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all install-strip installdirs mostlyclean-generic \ +all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean diff -druN libtool-1.3/mdemo/acinclude.m4 libtool-1.3.2/mdemo/acinclude.m4 --- libtool-1.3/mdemo/acinclude.m4 Thu Apr 29 10:28:34 1999 +++ libtool-1.3.2/mdemo/acinclude.m4 Thu May 20 20:33:27 1999 @@ -21,7 +21,7 @@ ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -382,6 +382,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -405,9 +406,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -420,5 +423,5 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl diff -druN libtool-1.3/mdemo/aclocal.m4 libtool-1.3.2/mdemo/aclocal.m4 --- libtool-1.3/mdemo/aclocal.m4 Thu Apr 29 10:28:35 1999 +++ libtool-1.3.2/mdemo/aclocal.m4 Tue May 25 21:31:17 1999 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl PARTICULAR PURPOSE. -# serial 39 AC_PROG_LIBTOOL +# serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -372,6 +372,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for @@ -395,9 +396,11 @@ if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" + INCLTDL= fi ]) @@ -410,8 +413,8 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl -dnl This is just to quiet aclocal about the macro not being used -if(a,b,[AC_DISABLE_FAST_INSTALL])dnl +dnl This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL])dnl # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -424,8 +427,6 @@ AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -446,19 +447,6 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -dnl We check for tar when the user configures the end package. -dnl This is sad, since we only need this for "dist". However, -dnl there's no other good way to do it. We prefer GNU tar if -dnl we can find it. If we can't find a tar, it doesn't really matter. -AC_CHECK_PROGS(AMTAR, gnutar gtar tar) -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - dnl We have GNU tar. - AMTARFLAGS=o - fi -fi -AC_SUBST(AMTARFLAGS) AC_REQUIRE([AC_PROG_MAKE_SET])]) # diff -druN libtool-1.3/mdemo/configure libtool-1.3.2/mdemo/configure --- libtool-1.3/mdemo/configure Thu Apr 29 10:28:36 1999 +++ libtool-1.3.2/mdemo/configure Tue May 25 21:31:18 1999 @@ -699,7 +699,6 @@ fi - PACKAGE=mdemo VERSION=0.1 @@ -719,7 +718,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:723: checking for working aclocal" >&5 +echo "configure:722: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -732,7 +731,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:736: checking for working autoconf" >&5 +echo "configure:735: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -745,7 +744,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:749: checking for working automake" >&5 +echo "configure:748: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -758,7 +757,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:762: checking for working autoheader" >&5 +echo "configure:761: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -771,7 +770,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:775: checking for working makeinfo" >&5 +echo "configure:774: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -783,53 +782,12 @@ echo "$ac_t""missing" 1>&6 fi -for ac_prog in gnutar gtar tar -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:792: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AMTAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AMTAR"; then - ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AMTAR="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AMTAR="$ac_cv_prog_AMTAR" -if test -n "$AMTAR"; then - echo "$ac_t""$AMTAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AMTAR" && break -done - -AMTARFLAGS= -if test -n "$AMTAR"; then - if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then - AMTARFLAGS=o - fi -fi - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:833: checking for $ac_word" >&5 +echo "configure:791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -859,7 +817,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:863: checking for $ac_word" >&5 +echo "configure:821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -910,7 +868,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:914: checking for $ac_word" >&5 +echo "configure:872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -942,7 +900,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -953,12 +911,12 @@ cat > conftest.$ac_ext << EOF -#line 957 "configure" +#line 915 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -984,12 +942,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:993: checking whether we are using GNU C" >&5 +echo "configure:951: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -998,7 +956,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1017,7 +975,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1021: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:979: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1049,12 +1007,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1053: checking for working const" >&5 +echo "configure:1011: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1124,12 +1082,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1128: checking for Cygwin environment" >&5 +echo "configure:1086: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1157,19 +1115,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1161: checking for mingw32 environment" >&5 +echo "configure:1119: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1188,7 +1146,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1192: checking for executable suffix" >&5 +echo "configure:1150: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1198,7 +1156,7 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1225,6 +1183,7 @@ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL=../libltdl/libltdlc.la + INCLTDL=-I../libltdl @@ -1305,7 +1264,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1309: checking host system type" >&5 +echo "configure:1268: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1326,7 +1285,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1330: checking build system type" >&5 +echo "configure:1289: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1346,7 +1305,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1350: checking for $ac_word" >&5 +echo "configure:1309: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1385,7 +1344,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1389: checking for ld used by GCC" >&5 +echo "configure:1348: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1409,10 +1368,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1413: checking for GNU ld" >&5 +echo "configure:1372: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1416: checking for non-GNU ld" >&5 +echo "configure:1375: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1448,7 +1407,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1452: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1411: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1464,7 +1423,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1468: checking for BSD-compatible nm" >&5 +echo "configure:1427: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1501,7 +1460,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1505: checking whether ln -s works" >&5 +echo "configure:1464: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1545,8 +1504,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1549 "configure"' > conftest.$ac_ext - if { (eval echo configure:1550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1508 "configure"' > conftest.$ac_ext + if { (eval echo configure:1509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1567,19 +1526,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1571: checking whether the C compiler needs -belf" >&5 +echo "configure:1530: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1690,7 +1649,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1694: checking how to run the C preprocessor" >&5 +echo "configure:1653: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1705,13 +1664,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1674: \"$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 : @@ -1722,13 +1681,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1691: \"$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 : @@ -1739,13 +1698,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1708: \"$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 : @@ -1773,17 +1732,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1777: checking for $ac_hdr" >&5 +echo "configure:1736: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1746: \"$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 rm -rf conftest* @@ -1817,7 +1776,7 @@ ;; *-ncr-sysv4.3*) echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6 -echo "configure:1821: checking for _mwvalidcheckl in -lmw" >&5 +echo "configure:1780: checking for _mwvalidcheckl in -lmw" >&5 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1825,7 +1784,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1857,7 +1816,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1861: checking for main in -lm" >&5 +echo "configure:1820: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1865,14 +1824,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1895,7 +1854,7 @@ ;; *) echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1899: checking for main in -lm" >&5 +echo "configure:1858: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1903,14 +1862,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2090,8 +2049,6 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g -s%@AMTAR@%$AMTAR%g -s%@AMTARFLAGS@%$AMTARFLAGS%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@EXEEXT@%$EXEEXT%g diff -druN libtool-1.3/mdemo/main.c libtool-1.3.2/mdemo/main.c --- libtool-1.3/mdemo/main.c Thu Mar 11 19:13:00 1999 +++ libtool-1.3.2/mdemo/main.c Thu May 20 18:02:42 1999 @@ -151,7 +151,7 @@ int i; int ret = 0; - printf ("Welcome GNU libtool mdemo!\n"); + printf ("Welcome to GNU libtool mdemo!\n"); if (argc < 2) { fprintf (stderr, "usage: %s module [module...]\n", argv[0]); diff -druN libtool-1.3/mkinstalldirs libtool-1.3.2/mkinstalldirs --- libtool-1.3/mkinstalldirs Mon Apr 26 23:42:09 1999 +++ libtool-1.3.2/mkinstalldirs Wed Apr 14 09:14:14 1999 @@ -4,9 +4,29 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ +# $Id: mkinstalldirs,v 1.14 1999/04/09 21:44:01 bje Exp $ errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + +# process command line arguments +while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) # -h for help + echo "${usage}" 1>&2; exit 0 ;; + -m ) # -m PERM arg + shift + test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } + dirmode="${1}" + shift ;; + -- ) shift; break ;; # stop option processing + -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option + * ) break ;; # first non-opt arg + esac +done for file do @@ -28,6 +48,17 @@ if test ! -d "$pathcomp"; then errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + + lasterr="" + chmod $dirmode "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -37,4 +68,7 @@ exit $errstatus -# mkinstalldirs ends here +# Local Variables: +# mode:shell-script +# sh-indentation:3 +# End: diff -druN libtool-1.3/tests/Makefile.in libtool-1.3.2/tests/Makefile.in --- libtool-1.3/tests/Makefile.in Thu Apr 29 10:33:33 1999 +++ libtool-1.3.2/tests/Makefile.in Tue May 25 21:32:36 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + SHELL = @SHELL@ srcdir = @srcdir@ @@ -45,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -60,8 +60,6 @@ host_alias = @host_alias@ host_triplet = @host@ ACINCLUDE_M4_LIST = @ACINCLUDE_M4_LIST@ -AMTAR = @AMTAR@ -AMTARFLAGS = @AMTARFLAGS@ AS = @AS@ AWK = @AWK@ CC = @CC@ @@ -81,28 +79,9 @@ aclocaldir = @aclocaldir@ pkgdatadir = @pkgdatadir@ - AUTOMAKE_OPTIONS = gnits -TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \ - demo-static.test demo-make.test demo-exec.test \ - demo-inst.test demo-unst.test \ - mdemo-static.test mdemo-make.test mdemo-exec.test \ - mdemo-inst.test mdemo-unst.test \ - cdemo-conf.test cdemo-make.test cdemo-exec.test \ - demo-conf.test demo-make.test demo-exec.test \ - demo-inst.test demo-unst.test deplibs.test \ - mdemo-conf.test mdemo-make.test mdemo-exec.test \ - mdemo-inst.test mdemo-unst.test dryrun.test \ - demo-nofast.test demo-make.test demo-exec.test \ - demo-inst.test demo-unst.test \ - cdemo-shared.test cdemo-make.test cdemo-exec.test \ - demo-shared.test demo-make.test demo-exec.test demo-inst.test \ - hardcode.test build-relink.test noinst-link.test demo-unst.test \ - mdemo-shared.test mdemo-make.test mdemo-exec.test \ - mdemo-inst.test mdemo-unst.test \ - assign.test link.test link-2.test nomode.test \ - quote.test sh.test suffix.test +TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test demo-static.test demo-make.test demo-exec.test demo-inst.test demo-unst.test mdemo-static.test mdemo-make.test mdemo-exec.test mdemo-inst.test mdemo-unst.test cdemo-conf.test cdemo-make.test cdemo-exec.test demo-conf.test demo-make.test demo-exec.test demo-inst.test demo-unst.test deplibs.test mdemo-conf.test mdemo-make.test mdemo-exec.test mdemo-inst.test mdemo-unst.test dryrun.test demo-nofast.test demo-make.test demo-exec.test demo-inst.test demo-unst.test cdemo-shared.test cdemo-make.test cdemo-exec.test demo-shared.test demo-make.test demo-exec.test demo-inst.test hardcode.test build-relink.test noinst-link.test demo-unst.test mdemo-shared.test mdemo-make.test mdemo-exec.test mdemo-inst.test mdemo-unst.test assign.test link.test link-2.test nomode.test quote.test sh.test suffix.test # We should export these variables when we run ltconfig. @@ -112,21 +91,18 @@ LIBS = @LIBS@ # Be sure to reexport important environment variables. -TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \ - LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" +TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" EXTRA_DIST = defs $(TESTS) -subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = -DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -143,11 +119,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = tests + distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -155,50 +133,24 @@ fi; \ done check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; \ + @failed=0; all=0; \ srcdir=$(srcdir); export srcdir; \ for tst in $(TESTS); do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if test -f $$tst; then dir=.; \ + else dir="$(srcdir)"; fi; \ + if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *" $$tst "*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ + echo "PASS: $$tst"; \ elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *" $$tst "*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ fi; \ done; \ if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ + banner="All $$all tests passed"; \ else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ + banner="$$failed of $$all tests failed"; \ fi; \ dashes=`echo "$$banner" | sed s/./=/g`; \ echo "$$dashes"; \ @@ -228,7 +180,7 @@ all-am: Makefile all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: @@ -262,7 +214,7 @@ .PHONY: tags distdir check-TESTS info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all install-strip installdirs mostlyclean-generic \ +all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean