From: Charles Wilson <libtool@cwilson.fastmail.fm>
Date: Mon, 1 Nov 2004 16:29:15 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_mode_install): On Windows based hosts,
X-Git-Tag: release-2-1b~882
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5817d126bfe28b40f74e3fd6a762ffa7b1c54f8e;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_mode_install): On Windows based hosts,
ensure that import libraries don't get stripped.
* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): On Windows based hosts,
use postinstall_cmds to strip DLL (not import lib!) when symbol
stripped installation was requested.
---

diff --git a/ChangeLog b/ChangeLog
index 685b32b86..b20b1597b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-01  Charles Wilson  <spam.protected>,
+	    Peter Ekberg <spam.protected>
+
+	* config/ltmain.m4sh (func_mode_install): On Windows based hosts,
+	ensure that import libraries don't get stripped.
+	* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): On Windows based hosts,
+	use postinstall_cmds to strip DLL (not import lib!) when symbol
+	stripped installation was requested.
+
 2004-10-30  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/ltdl.c (loader_init_callback): Back out broken cast.
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index f68477a62..8b104baa2 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -1833,7 +1833,17 @@ func_mode_install ()
 	  # Install the shared library and build the symlinks.
 	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
-	  if test -n "$stripme" && test -n "$striplib"; then
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
 	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
 	  fi
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 17c00cb2b..df26e8952 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1719,7 +1719,10 @@ cygwin* | mingw* | pw32*)
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;$ECHO \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $RM \$dlpath'