From: Olly Betts <olly@muscat.co.uk>
Date: Mon, 26 Jul 1999 15:16:10 +0000 (+0000)
Subject: * libtool.m4(cygwin mingw32, AC_LIBTOOL_SETUP): Oops.  Fix some
X-Git-Tag: multi-language-fork~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee8b0531741c3668f3bec8b2d197ab1ba9c716b7;p=thirdparty%2Flibtool.git

* libtool.m4(cygwin mingw32, AC_LIBTOOL_SETUP): Oops.  Fix some
typos made by Evil Gary while (mis)applying my patch :-).
---

diff --git a/ChangeLog b/ChangeLog
index 7c68ff115..ae97c97db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-07-26  Olly Betts  <olly@muscat.co.uk>
 
+	* libtool.m4(cygwin mingw32, AC_LIBTOOL_SETUP): Oops.  Fix some
+	typos made by Evil Gary while (mis)applying my patch :-).
+
 	* libtool.m4(cygwin mingw32, AC_LIBTOOL_SETUP):  On second
 	thoughts, only probe for -mdll vs -dll on mingw, and revert to
 	the old `-Wl,--dll -nostartfiles' on cygwin.
diff --git a/libtool.m4 b/libtool.m4
index 1a5be173e..1533d91c5 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -138,14 +138,14 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
 
   case $host in
   *-*-cygwin*)
-    # cygwin systems need to tell pass --dll to the linker, and not link
+    # cygwin systems need to pass --dll to the linker, and not link
     # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_ddll_switch="-Wl,-dll -nostartfiles" ;;
+    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
   *-*-mingw*)
     # old mingw systems require "-dll" to link a DLL, while more recent ones
     # require "-mdll"
     SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll$lt_nostartfiles"
+    CFLAGS="$CFLAGS -mdll"
     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" ;;