Head requires automake 1.10a, but Bruno said that gettext 0.15 is incompatible 
with automake 1.10.  So head now requires gettext 0.16, released today.  
HACKING is for CVS use only, so it is not mentioned in the Changelog.

2006-10-27  Eric Blake  <[EMAIL PROTECTED]>

        * bootstrap (gnulib): No longer a need to patch after gnulib-tool
        --update.
        * configure.ac (AM_GNU_GETTEXT_VERSION): Bump requirement to
        0.16, since 0.15 is incompatible with our automake requirement.

Index: HACKING
===================================================================
RCS file: /sources/m4/m4/HACKING,v
retrieving revision 1.6
diff -u -r1.6 HACKING
--- HACKING     16 Oct 2006 22:12:07 -0000      1.6
+++ HACKING     27 Oct 2006 21:07:58 -0000
@@ -43,9 +43,9 @@
 ================
 
 * Before you can build from CVS, you need to bootstrap.  This requires a
-  pre-installed version of GNU M4 1.4.x or later, built from a package,
-  Autoconf 2.60 or later, Automake 1.10a or later, CVS Head of Libtool
-  (will become Libtool 2.0), Gettext 0.15 or later, and a CVS checkout
+  pre-installed version of GNU M4 1.4.x or later, built from a package;
+  Autoconf 2.60 or later; Automake 1.10a or later; CVS Head of Libtool
+  (will become Libtool 2.0); Gettext 0.16 or later; and a CVS checkout
   of gnulib.  Gnulib can be obtained by:
     cvs -z3 -d:pserver:[EMAIL PROTECTED]:/sources/gnulib co gnulib
 
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.40
diff -u -r1.40 bootstrap
--- bootstrap   21 Sep 2006 13:05:26 -0000      1.40
+++ bootstrap   27 Oct 2006 21:07:58 -0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2006-09-21
+# bootstrap (GNU M4) version 2006-10-27
 # Written by Gary V. Vaughan  <[EMAIL PROTECTED]>
 
 # Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -39,8 +39,8 @@
 
 # This script bootstraps a CVS checkout of GNU M4 by correctly
 # calling out to parts of the GNU Build Platform.  Currently this
-# requires GNU Gettext 0.15 or better, and Autoconf 2.60 or better
-# Automake 1.9b or better, and bleeding edge CVS snapshots of
+# requires GNU Gettext 0.16 or better, and Autoconf 2.60 or better
+# Automake 1.10a or better, and bleeding edge CVS snapshots of
 # Libtool and Gnulib.
 
 # Report bugs to <[email protected]>
@@ -357,11 +357,6 @@
 func_echo "running: ${GNULIB_TOOL} --update"
 ${GNULIB_TOOL} --update
 
-func_echo "patching include directories in gnulib regex module"
-mv $config_macro_dir/regex.m4 $config_macro_dir/regex-m4.old
-sed 's,lib/regex.c,gnu/regex.c,g' $config_macro_dir/regex-m4.old > 
$config_macro_dir/regex.m4 && \
-  $RM $config_macro_dir/regex-m4.old
-
 
 ## --------------------------------- ##
 ## Copy additional src only modules. ##
Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.59
diff -u -r1.59 configure.ac
--- configure.ac        16 Oct 2006 22:12:07 -0000      1.59
+++ configure.ac        27 Oct 2006 21:07:58 -0000
@@ -138,7 +138,7 @@
 ## Gettext support. ##
 ## ---------------- ##
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.16])
 M4_GNU_GETTEXT
 
 




_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches

Reply via email to