From: Kevin P. Fleming <kpfleming@backtobasicsmgmt.com>
Date: Fri, 23 Jan 2004 06:04:39 +0000 (+0000)
Subject: Charles Wilson <cygwin@cwilson.fastmail.fm>
X-Git-Tag: release-1-5-2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=306f1a8a19fbf43d657dfc0d91ce988233a8bd8d;p=thirdparty%2Flibtool.git

Charles Wilson <cygwin@cwilson.fastmail.fm>

* ltmain.in: include --tag options, if specified, in the
relink_command in uninstalled .la files.  Also, preserve --silent,
--debug options when libtool re-execs itself.
* NEWS: Updated.
---

diff --git a/ChangeLog b/ChangeLog
index 6c33855dd..0e2cdfefa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-23  Kevin P. Fleming  <kpfleming@backtobasicsmgmt.com>
+	Charles Wilson <cygwin@cwilson.fastmail.fm>
+	                                                                        
+	* ltmain.in: include --tag options, if specified, in the
+	relink_command in uninstalled .la files.  Also, preserve --silent,
+	--debug options when libtool re-execs itself.
+	* NEWS: Updated.
+
 2004-01-23  James Henstridge  <james@daa.com.au>,
 	Scott James Remnant  <scott@netsplit.com>
 
diff --git a/ltmain.in b/ltmain.in
index 9ccfaec35..6a6a053eb 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -176,6 +176,7 @@ do
       ;;
     tag)
       tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
 
       # Check whether tagname contains only valid characters
       case $tagname in
@@ -238,6 +239,7 @@ do
   --debug)
     $echo "$progname: enabling shell trace mode"
     set -x
+    preserve_args="$preserve_args $arg"
     ;;
 
   --dry-run | -n)
@@ -268,6 +270,7 @@ do
 
   --quiet | --silent)
     show=:
+    preserve_args="$preserve_args $arg"
     ;;
 
   --tag) prevopt="--tag" prev=tag ;;
@@ -275,6 +278,7 @@ do
     set tag "$optarg" ${1+"$@"}
     shift
     prev=tag
+    preserve_args="$preserve_args --tag"
     ;;
 
   -dlopen)
@@ -5097,7 +5101,7 @@ fi\
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
         relink_command=
@@ -5722,7 +5726,7 @@ relink_command=\"$relink_command\""
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 --finish$current_libdirs'
+      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
     else
       exit 0
     fi