From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 4 Jun 2010 21:19:11 +0000 (+0700)
Subject: Shift correctly in numbered option argument collection.
X-Git-Tag: v2.2.10~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd9aeebfe95b73aa7f1b5539806eee8b4b23f0c6;p=thirdparty%2Flibtool.git

Shift correctly in numbered option argument collection.

* libltdl/config/getopt.m4sh (_m4go_option): Argument list also
needs to be `shift'ed in the shell option loop after processing a
numbered argument collection.
---

diff --git a/ChangeLog b/ChangeLog
index 89be0939d..756752721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Shift correctly in numbered option argument collection.
+	* libltdl/config/getopt.m4sh (_m4go_option): Argument list also
+	needs to be `shift'ed in the shell option loop after processing a
+	numbered argument collection.
+
 	Fetch from new upstream host for config.guess and config.sub.
 	* Makefile.maint (WGET_CGIT): Location of newest config.guess and
 	config.sub upstream.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 6e0e2c61e..74491d0cd 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -357,7 +357,7 @@ dnl only write the file_arg fragment when we didn't already write opt_file_arg:
 m4_bmatch([$3], [@], [m4_bmatch([$3], [?], [],
                    [m4_expand([m4go_file_arg([$1])])
 ])])m4_n(m4go_unindent([$6]))[]dnl
-m4_bmatch([$3], [[!+]], [			shift
+m4_bmatch([$3], [[!+;]], [			shift
 ])			;;
 ])],
     [m4_ifnblank([$2],