portability: fix spawning on at least FreeBSD 8 and FreeBSD 9.

Reported by Johan van Selst at
<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00014.html>.
* NEWS (2.4.3): New.
* THANKS (Johan van Selst): Add.
* etc/prefix-gnulib-mk (prefix): Adjust regex for makefile
targets so that gnulib's new c++defs.h is matched.
* gnulib: Update to latest.
(cherry picked from commit 311b2e56eaad952fc7908336e3aeb019dd8bf1ee)

Conflicts:

	NEWS

diff --git a/ChangeLog b/ChangeLog
index 9e8359e8aad0c9f3ab0f9560cef6e54ab7e46589..15f76f8c09a84abd4284e739f818b040eb11017b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-23  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       portability: fix spawning on at least FreeBSD 8 and FreeBSD 9.
+       Reported by Johan van Selst at
+       <http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00014.html>.
+       * NEWS (2.4.3): New.
+       * THANKS (Johan van Selst): Add.
+       * etc/prefix-gnulib-mk (prefix): Adjust regex for makefile
+       targets so that gnulib's new c++defs.h is matched.
+       * gnulib: Update to latest.
+
 2010-03-20  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        maint: update for changes to gnulib's announce-gen.

diff --git a/NEWS b/NEWS
index fa7d977083efe00ddbb8368f0af206572d1600b5..814a3b57037d406fdd32e9adf031eccea8c22d8d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -236,6 +236,11 @@ Bison News
   determine which destructor to call for the lookahead upon a syntax
   error or upon parser return.  This bug has been fixed.
 
+* Changes in version 2.4.3 (????-??-??):
+
+** Problems with spawning M4 on at least FreeBSD 8 and FreeBSD 9 have
+   been fixed.
+
 * Changes in version 2.4.2 (2010-03-20):
 
 ** Some portability problems that resulted in failures and livelocks

diff --git a/THANKS b/THANKS
index e1628bef94487c7a35b6f034b139fa075ded627c..a417bbc0e981e142f20f3c4e1d9d53a46c66d6df 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -47,6 +47,7 @@ Jesse Thilo               jthilo@gnu.org
 Jim Kent                  jkent@arch.sel.sony.com
 Jim Meyering              jim@meyering.net
 Joel E. Denny             jdenny@ces.clemson.edu
+Johan van Selst           johans@stack.nl
 Jonathan Nieder           jrnieder@gmail.com
 Juan Manuel Guerrero      juan.guerrero@gmx.de
 Kees Zeelenberg           kzlg@users.sourceforge.net

diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index ecf16927f2209e0c4a5312dd57f0771d4a0dcdc8..c059417a1389fdc1457b34b0b45b2f8e8dd24e4b 100644 (file)
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -1,5 +1,6 @@
 announce-gen
 arg-nonnull.h
+c++defs.h
 compile
 config.guess
 config.rpath

diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index c909f72b8ddf441d25d74bdd301b1b0017de244b..af528906d678b3e854fe15fb251b7843b65397cf 100644 (file)
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,5 +1,6 @@
 /announce-gen
 /arg-nonnull.h
+/c++defs.h
 /compile
 /config.guess
 /config.rpath

diff --git a/etc/prefix-gnulib-mk b/etc/prefix-gnulib-mk
index 1bff69bc70238c4be96ca02d0686647e2c507c58..56dfd497000369a5ac5a2b22eddef8ffdf7cf0e4 100755 (executable)
--- a/etc/prefix-gnulib-mk
+++ b/etc/prefix-gnulib-mk
@@ -90,7 +90,7 @@ sub prefix ($)
   # Prefix all the occurrence of files in rules.  If there is nothing
   # after in the :, it's probably a phony target, or a suffix rule.
   # Don't touch it.
-  s{^([-\w/]+\.[-\w.]+ *: *\S.*)$}
+  s{^([-\w+/]+\.[-\w.]+ *: *\S.*)$}
    {prefix_words($1)}gem;
 
   # Prefix files in variables.

diff --git a/gnulib b/gnulib
index 9d0ad652de159d08e5f679842f8a2a5658196361..7bacd338464a463f3ba0c14effd86b71ce3672b4 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 9d0ad652de159d08e5f679842f8a2a5658196361
+Subproject commit 7bacd338464a463f3ba0c14effd86b71ce3672b4

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 2315305187d90a71fb2d091c98a2ec9c58b1d968..1bceef2f24c31c3dd738228b9d55bc7cab8e1ea1 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -131,8 +131,10 @@ warn-on-use.m4
 warning.m4
 warnings.m4
 wchar.m4
+wchar_h.m4
 wchar_t.m4
 wctype.m4
+wctype_h.m4
 wcwidth.m4
 wint_t.m4
 xalloc.m4

diff --git a/m4/.gitignore b/m4/.gitignore
index 7ff1d99e2fcd8194c575285030a2db76f5ade18f..0f51068b22b4390badd1a0d22b9ad2c78ea51eb5 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -131,8 +131,10 @@
 /warning.m4
 /warnings.m4
 /wchar.m4
+/wchar_h.m4
 /wchar_t.m4
 /wctype.m4
+/wctype_h.m4
 /wcwidth.m4
 /wint_t.m4
 /xalloc.m4