Work around BSD getopt bug.

* gnulib: Update.
* doc/m4.texinfo (Command line files): Add test.

Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit a6c565c6f4b934be334dd9ada97b215595d10103)

3 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 524457e2..1623af70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-28  Eric Blake  <ebb9@byu.net>
 
+	Work around BSD getopt bug.
+	* gnulib: Update.
+	* doc/m4.texinfo (Command line files): Add test.
+
 	Use correct printf formats.
 	* src/macro.c (adjust_refcount): Use %zu for size_t.
 	* src/builtin.c (m4_maketemp): Ensure format width argument is
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 770fe572..e594128d 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -1086,6 +1086,22 @@ syscmd([echo 'esyscmd(echo hi >&2 && echo err"print(bye
 @error{}bye
 @result{}0
 @end example
+
+@comment Test that we obey POSIX semantics with -D interspersed with
+@comment files, even with POSIXLY_CORRECT (BSD getopt gets it wrong).
+
+$ @kbd{m4 }
+@example
+ifdef(`__unix__', ,
+      `errprint(` skipping: syscmd does not have unix semantics
+')m4exit(`77')')dnl
+changequote(`[', `]')dnl
+syscmd([POSIXLY_CORRECT=1 ']__program__[' -Dbar=hello foo -Dbar=world foo])dnl
+@result{}hello
+@result{}world
+sysval
+@result{}0
+@end example
 @end ignore
 
 @node Syntax
diff --git a/gnulib b/gnulib
-Subproject 9bb0a7e5780f8cc02b234981fa17cad396a0244
+Subproject c0c5acfbe255f5542bc1c81c7aec223d95e504a