From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 18 Oct 1999 20:03:57 +0000 (+0000)
Subject: * libtool.m4: test command used == which should be =.
X-Git-Tag: multi-language-fork~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d0dc16aaf12dd33c6a9d1a62070684b37a249c2;p=thirdparty%2Flibtool.git

* libtool.m4: test command used == which should be =.
Support -mno-cygwin flag for building mingw32 dlls.
* ltconfig.in (file_magic_cmd): add missing quotes.
(deplibs_check_method): and here.
---

diff --git a/ChangeLog b/ChangeLog
index bbd1fa3c8..f44d871bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-18  Tor Lillqvist  <tml@iki.fi>
+
+	* libtool.m4: test command used == which should be =.
+	Support -mno-cygwin flag for building mingw32 dlls.
+	* ltconfig.in (file_magic_cmd): add missing quotes.
+	(deplibs_check_method): and here.
+	 
 1999-10-16  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
 	* libltdl/ltdl.c (lt_dlopen): Do not search paths when the
diff --git a/libtool.m4 b/libtool.m4
index 3e002db8f..cff70c695 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -73,7 +73,7 @@ dnl
 # Only perform the check for file, if the check method requires it
 case "$deplibs_check_method" in
 file_magic*)
-  if test "$file_magic_cmd" == '$FILE'; then
+  if test "$file_magic_cmd" = '$FILE'; then
     AC_PATH_FILE
   fi
   ;;
@@ -147,16 +147,14 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([DllMain (0, 0, 0);],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);],
+    [AC_TRY_LINK([],
+      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+      DllMain (0, 0, 0);],
       [lt_cv_need_dllmain=yes],[lt_cv_need_dllmain=no])])
 
   case $host in
-  *-*-cygwin*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  *-*-mingw*)
+  case "$host/$CC" in
+  *-*-cygwin*/gcc*-mno-cygwin|*-*-mingw*)
     # old mingw systems require "-dll" to link a DLL, while more recent ones
     # require "-mdll"
     SAVE_CFLAGS="$CFLAGS"
@@ -164,6 +162,10 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
     AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
       [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
     CFLAGS="$SAVE_CFLAGS" ;;
+  *-*-cygwin*)
+    # cygwin systems need to pass --dll to the linker, and not link
+    # crt.o which will require a WinMain@16 definition.
+    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
   esac
   ;;
   ])
diff --git a/ltconfig.in b/ltconfig.in
index 8575e58e2..22c453fbd 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1437,8 +1437,8 @@ fi
 reload_flag=@reload_flag@
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 
-file_magic_cmd=@file_magic_cmd@
-deplibs_check_method=@deplibs_check_method@
+file_magic_cmd="@file_magic_cmd@"
+deplibs_check_method="@deplibs_check_method@"
 
 # PORTME Fill in your ld.so characteristics
 library_names_spec=