From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 4 Oct 2004 09:32:52 +0000 (+0000)
Subject: * config/ltmain.m4sh: Need to include getopt.m4sh earlier so that
X-Git-Tag: release-1-9f~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbef6ba37c5c1b34b37c055c869e048819ad837f;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh: Need to include getopt.m4sh earlier so that
progpath is set before it is called to --no-reexec.
* NEWS: Updated.
---

diff --git a/ChangeLog b/ChangeLog
index 5def95a2b..550ee41d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-04  Gary V. Vaughan  <gary@gnu.org>
+
+	* config/ltmain.m4sh: Need to include getopt.m4sh earlier so that
+	progpath is set before it is called to --no-reexec.
+	* NEWS: Updated.
+
 2004-10-04  Gary V. Vaughan  <gary@gnu.org>
 
 	Without this change, the distributed libtool tarball has a
diff --git a/NEWS b/NEWS
index 7b27fd040..ffe0ae69c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.9f: 2004-??-??; CVS version 1.9e, Libtool team:
+* Fix a regression in 1.9d, where progpath was used for --no-reexec before it
+  was set.
 * Fix a regression in 1.9d, which required an installed automake to build the
   bootstrapped tarball.
 * Fix hanging bug on MinGW.
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 334ad498a..d2d774937 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -78,6 +78,8 @@ package_revision=@package_revision@
 AS_SHELL_SANITIZE
 $as_unset CDPATH
 
+m4_include([getopt.m4sh])
+
 # Check that we have a working $ECHO.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
@@ -102,8 +104,6 @@ EOF
   exit $EXIT_SUCCESS
 fi
 
-m4_include([getopt.m4sh])
-
 default_mode=
 magic="%%%MAGIC variable%%%"