From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 27 Jun 2010 07:54:57 +0000 (+0700)
Subject: Amend a missed opt_mode rename instance in ltmain.m4sh.
X-Git-Tag: v2.4~133
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6767ed13de0f741bfa09ffa7fcf2d1cee6d2a3d5;p=thirdparty%2Flibtool.git

Amend a missed opt_mode rename instance in ltmain.m4sh.

* libltdl/config/ltmain.m4sh <mode>: Rename to opt_mode.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/ChangeLog b/ChangeLog
index 853ee86ab..dd9f8616f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-27  Gary V. Vaughan  <gary@gnu.org>
 
+	Amend a missed opt_mode rename instance in ltmain.m4sh.
+	* libltdl/config/ltmain.m4sh <mode>: Rename to opt_mode.
+
 	Fix portability regressions in today's earlier changeset.
 	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): `sed -i' is not
 	portable; use `mv -f ...|| cp -f ...' instead.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 02623224c..59fbdb702 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -137,7 +137,6 @@ magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
@@ -5364,7 +5363,7 @@ func_mode_link ()
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=