* ltmain.in (ild): Revert the change which allowed libtool to

link libraries with dependencies on .la libs.
* NEWS: Removed reference to win32, incase 1.3 ships before
ild is ready.
* doc/PLATFORMS: Removed i686-pc-cygwin32, for the same reason.
* doc/libtool.texi: Removed win32 refs, for the same reason.

diff --git a/ChangeLog b/ChangeLog
index e9e09790abe47d7551d6bfa82a61ed2deb5b878c..680be40e3cdc0f77bc97d6223add784abc508c42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-01-22  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+
+       * ltmain.in (ild): Revert the change which allowed libtool to
+       link libraries with dependencies on .la libs.
+       * NEWS: Removed reference to win32, incase 1.3 ships before
+       ild is ready.
+       * doc/PLATFORMS: Removed i686-pc-cygwin32, for the same reason.
+       * doc/libtool.texi: Removed win32 refs, for the same reason.
+
 1999-01-22  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltmain.in (Xsed): add 1 to Xsed definition that goes into

diff --git a/NEWS b/NEWS
index 217bdef84abbdeed2572c2165245d28e8d61e561..ccd1fb64b51adcd9bd5933c253f023c89be01125 100644 (file)
--- 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 Win32, aix3, aix4, SysV 4.3, BSD/OS 4.x and NetBSD
+* Improved support for 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 54ee40d0461aa06c07253e556d03fa16389aa59c..a80abfe641b8bd55f789fb4ce75a9e03bcd1221c 100644 (file)
--- a/doc/PLATFORMS
+++ b/doc/PLATFORMS
@@ -46,7 +46,6 @@ 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 b08dd63d347e65b79ed6434295aa11526da15d0f..0264fbddb6a7bc2a2354f22f76b018090a183e6f 100644 (file)
--- 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 and Windows 95, do not even allow you this
+Some platforms, such as AIX, 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, Win32 etc.) 
+dlopen wrapper for various platforms (Linux, Solaris, HP/UX etc.) 
 including support for dlpreopened modules (@pxref{Dlpreopening}).
 
 The tests @file{mdemo-make.test}, @file{mdemo-exec.test},
@@ -3127,9 +3127,7 @@ 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}, 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.
+@samp{file}.  This is option that works best I think.
 
 @item file_regex
 @vindex file_regex

diff --git a/ltmain.in b/ltmain.in
index 08cb2030b8f350b301c34ec795d93ee715293389..24fe983b130e4e32824568250911f168af258a22 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1388,14 +1388,11 @@ 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