getopt usage

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gnulib recently separated POSIX getopt from GNU getopt extensions, and
marked the getopt module obsolete.  This fixes m4 to work with the latest
gnulib.git again.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqEFe0ACgkQ84KuGfSFAYCrWQCeKCAc2Alq5KWKY2I+iaZCiC88
WCwAoNXufLCH0By9UcE2tbwz/eQT6Hcj
=Mwnq
-----END PGP SIGNATURE-----

>From e2c7e421d75fa5cfb6a013b14ffa66b6b4abc35e Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 13 Aug 2009 07:31:53 -0600
Subject: [PATCH] Explicitly request GNU getopt extensions.

* gnulib: Update.
* m4/gnulib-cache.m4: Use getopt-gnu, not obsolete getopt module.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |    6 ++++++
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |    4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceca154..1fac6e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-13  Eric Blake  <address@hidden>
+
+       Explicitly request GNU getopt extensions.
+       * gnulib: Update.
+       * m4/gnulib-cache.m4: Use getopt-gnu, not obsolete getopt module.
+
 2009-07-22  Eric Blake  <address@hidden>

        Fix testsuite on Solaris.
diff --git a/gnulib b/gnulib
index 80cb44f..4b05d4e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 80cb44fa0b094ad965f7bd88ad7e46e83df418d5
+Subproject commit 4b05d4e5fa7e1a7affd08576388c08b10bcf8cf0
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 3c59620..c808284 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@


 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests 
--no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset 
binary-io c-stack clean-temp cloexec close-stream closein config-h dirname 
error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs 
getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops memchr2 mkstemp 
obstack pipe progname regex sigaction stdbool stdint stdlib-safer strsignal 
strstr strtod strtol unlocked-io verror version-etc version-etc-fsf 
wait-process xalloc xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests 
--no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset 
binary-io c-stack clean-temp cloexec close-stream closein config-h dirname 
error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs 
getopt-gnu git-version-gen gnumakefile gnupload gpl-3.0 intprops memchr2 
mkstemp obstack pipe progname regex sigaction stdbool stdint stdlib-safer 
strsignal strstr strtod strtol unlocked-io verror version-etc version-etc-fsf 
wait-process xalloc xprintf xvasprintf-posix

 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -41,7 +41,7 @@ gl_MODULES([
   fopen-safer
   fseeko
   gendocs
-  getopt
+  getopt-gnu
   git-version-gen
   gnumakefile
   gnupload
-- 
1.6.3.3.334.g916e1