From 9ebf066e13f736707f98b5da4a8ae1758a7bd878 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 22 Jan 1999 14:28:26 +0000 Subject: [PATCH] * ltmain.in (ild): Redo the Reverted change which allowed libtool to link libraries with dependencies on .la libs. * NEWS: ReInsert reference to win32. * doc/PLATFORMS: ReInsert i686-pc-cygwin32, for the same reason. * doc/libtool.texi: ReInsert win32 refs, for the same reason. --- ChangeLog | 8 ++++++++ NEWS | 2 +- doc/PLATFORMS | 1 + doc/libtool.texi | 8 +++++--- ltmain.in | 11 +++++++---- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index beaf78fad..22aa57242 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-01-22 Gary V. Vaughan + + * ltmain.in (ild): Redo the Reverted change which allowed libtool + to link libraries with dependencies on .la libs. + * NEWS: ReInsert reference to win32. + * doc/PLATFORMS: ReInsert i686-pc-cygwin32, for the same reason. + * doc/libtool.texi: ReInsert win32 refs, for the same reason. + 1999-01-22 Gary V. Vaughan * configure.in (date): echo the version number during diff --git a/NEWS b/NEWS index ccd1fb64b..217bdef84 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool New in 1.2e: CVS version: * Support -R for specifying run-time path of programs and library dependencies * Support for BeOS -* Improved support for aix3, aix4, SysV 4.3, BSD/OS 4.x and NetBSD +* Improved support for Win32, aix3, aix4, SysV 4.3, BSD/OS 4.x and NetBSD * New -avoid-version option to avoid versioning for libraries * Various bugfixes diff --git a/doc/PLATFORMS b/doc/PLATFORMS index a80abfe64..54ee40d04 100644 --- a/doc/PLATFORMS +++ b/doc/PLATFORMS @@ -46,6 +46,7 @@ i586-pc-linux-gnulibc1 gcc 1.2e ok i686-pc-linux-gnu gcc 1.2e ok i686-pc-linux-gnu egcs 1.2e ok egcs 1.1.1 i686-pc-linux-gnulibc1 gcc 1.2e ok +i686-pc-cygwin32 egcs 1.2e ok m68k-next-nextstep3 gcc 1.2e ok static m68k-sun-sunos4.1.1 gcc 1.2e NS m88k-dg-dguxR4.12TMU01** gcc 1.2 ok diff --git a/doc/libtool.texi b/doc/libtool.texi index 0264fbddb..b08dd63d3 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -2291,7 +2291,7 @@ in order to guarantee that all the required libraries are found. This restriction is only necessary to preserve compatibility with static library systems and simple dynamic library systems. -Some platforms, such as AIX, do not even allow you this +Some platforms, such as AIX and Windows 95, do not even allow you this flexibility. In order to build a shared library, it must be entirely self-contained (that is, have references only to symbols that are found in the @samp{.lo} files or the specified @samp{-l} libraries), and you @@ -2886,7 +2886,7 @@ uninstalled correctly. The @file{mdemo} subdirectory contains a demonstration of a package that uses libtool and the system independent dlopen wrapper @file{libltdl} to load modules. The library @file{libltdl} provides an experimental -dlopen wrapper for various platforms (Linux, Solaris, HP/UX etc.) +dlopen wrapper for various platforms (Linux, Solaris, HP/UX, Win32 etc.) including support for dlpreopened modules (@pxref{Dlpreopening}). The tests @file{mdemo-make.test}, @file{mdemo-exec.test}, @@ -3127,7 +3127,9 @@ looks in the library link path for libraries that have the right libname. Then it runs @samp{$file_magic_command} on the library and checks for a match against [regex] using expr. I currently have linux-elf looking for the string: "ELF [0-9][0-9]*-bit [LM]SB shared object" on the output of -@samp{file}. This is option that works best I think. +@samp{file}, and some of the win32 ports looking for the string: "file format +pei*-i386.*architecture: i386" on the output of @samp{objdump -f}. +This is option that works best I think. @item file_regex @vindex file_regex diff --git a/ltmain.in b/ltmain.in index fa5455114..1e6bfd980 100644 --- a/ltmain.in +++ b/ltmain.in @@ -1389,11 +1389,14 @@ compiler." exit 1 fi + # If the following section is uncommented, then it is impossible to + # link with ltlibrary deplibs... + # How the heck are we supposed to write a wrapper for a shared library? - if test -n "$link_against_libtool_libs"; then - $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 - exit 1 - fi + #if test -n "$link_against_libtool_libs"; then + # $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 + # exit 1 + #fi if test -n "$dlfiles$dlprefiles"; then $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 -- 2.47.2