From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 7 Mar 2001 00:58:09 +0000 (+0000)
Subject: * libtool.m4 (library_names_spec): Use an appropriate filename
X-Git-Tag: release-1-3d~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a358c34655f9346e7ef937452cf0d1ca855b3a8a;p=thirdparty%2Flibtool.git

* libtool.m4 (library_names_spec): Use an appropriate filename
prefix for dlls -- lib for mingw; cyg for cygwin; pw for pw32.
From Tor Lillqvist <tml@iki.fi>
---

diff --git a/ChangeLog b/ChangeLog
index c20c65977..84a38257f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-07  Gary V. Vaughan  <gvv@techie.com>
+
+	* libtool.m4 (library_names_spec): Use an appropriate filename
+	prefix for dlls -- lib for mingw; cyg for cygwin; pw for pw32.
+	From Tor Lillqvist <tml@iki.fi>
+
 2001-03-06  Alexandre Oliva  <aoliva@redhat.com>
 
 	* libtool.m4 (can_build_shared) [AIX 4.[01], GCC]: GCC up to
@@ -6,7 +12,7 @@
 	* ltmain.in: When dropping dependencies of a -no-undefined
 	library, give up on building a shared library.
 
-20001-03-05  Akim Demaille  <akim@epita.fr>
+2001-03-05  Akim Demaille  <akim@epita.fr>
 
 	* ltmain.sh: Don't quote the argument of case/esac and
 	assignments.
diff --git a/libtool.m4 b/libtool.m4
index 47322fb6b..c976c62bf 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1818,11 +1818,21 @@ cygwin* | mingw* | pw32*)
   version_type=windows
   need_version=no
   need_lib_prefix=no
-  if test "$GCC" = yes; then
-    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
-  else
-    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
-  fi
+  case $GCC,$host_os in
+  yes,cygwin*)
+    library_names_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+    ;;
+  yes,mingw*)
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+    ;;
+  yes,pw32*)
+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+    ;;
+  *)
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
+    ;;
+  esac
   dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH