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 89be0939d9e8bb467e4f2375259cefbda90fb412..756752721c724635c397c72ee11fa8036bf9de65 100644 (file)
--- 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 6e0e2c61e35ca740edfc014569ad1b73fb5dbb74..74491d0cd51aa7edd00ed1515e19634a79b53ea8 100644 (file)
--- 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],