From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 20 Oct 1999 18:30:08 +0000 (+0000)
Subject: * libtool.m4:  these was a missing `*' in the -mno-cygwin
X-Git-Tag: multi-language-fork~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=861e305993b6ffea1e7c9e8724221922a99d2b53;p=thirdparty%2Flibtool.git

* libtool.m4:  these was a missing `*' in the -mno-cygwin
match.
* ltconfig.in (cygwin, ltdll_obj): fixed a quoting error.
(export_symbols_cmds): added missing cosmetic newline.
---

diff --git a/ChangeLog b/ChangeLog
index f44d871bc..9c50725af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-19  Tor Lillqvist  <tml@iki.fi>
+
+	* libtool.m4:  these was a missing `*' in the -mno-cygwin
+	match.
+	* ltconfig.in (cygwin, ltdll_obj): fixed a quoting error.
+	(export_symbols_cmds): added missing cosmetic newline.
+
 1999-10-18  Tor Lillqvist  <tml@iki.fi>
 
 	* libtool.m4: test command used == which should be =.
diff --git a/libtool.m4 b/libtool.m4
index cff70c695..7068e85a2 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -154,7 +154,7 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
 
   case $host in
   case "$host/$CC" in
-  *-*-cygwin*/gcc*-mno-cygwin|*-*-mingw*)
+  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
     # old mingw systems require "-dll" to link a DLL, while more recent ones
     # require "-mdll"
     SAVE_CFLAGS="$CFLAGS"
diff --git a/ltconfig.in b/ltconfig.in
index 22c453fbd..1ac8498b9 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1041,7 +1041,7 @@ EOF
     # recent cygwin and mingw systems supply a stub DllMain which the user
     # can override, but on older systems we have to supply one (in ltdll.c)
     if test "x$lt_cv_need_dllmain" = "xyes"; then
-      ltdll_obj="objdir/$soname-ltdll.$objext "
+      ltdll_obj='objdir/$soname-ltdll.'"$objext "
       ltdll_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
         test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~'
     else
@@ -1053,7 +1053,8 @@ EOF
     # then regenerate the def file from the symbol export list, so that
     # the compiled dll only exports the symbol export list.
     export_symbols_cmds="$ltdll_cmds"'
-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $objdir/$soname-def '$ltdll_obj'$libobjs $convenience~      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ;.*//" < $objdir/$soname-def > $export_symbols'
+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ;.*//" < $objdir/$soname-def > $export_symbols'
   
     archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
       _lt_hint=1;