* m4/regex.m4: Update the description of the configure-time option,

--without-included-regex, to state accurately what the defaults are,
and perhaps to give people an idea why using this option is risky.

diff --git a/ChangeLog b/ChangeLog
index 45b1fd9..ae7b937 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-24  Jim Meyering  <jim@meyering.net>
+
+       * m4/regex.m4: Update the description of the configure-time option,
+       --without-included-regex, to state accurately what the defaults are,
+       and perhaps to give people an idea why using this option is risky.
+

 2007-02-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Check for a nanosleep that
 2007-02-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Check for a nanosleep that

diff --git a/m4/regex.m4 b/m4/regex.m4
index 4b421bd..b8d5b1e 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 45
+#serial 46

 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006, 2007 Free Software Foundation, Inc.
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006, 2007 Free Software Foundation, Inc.


@@ -18,9 +18,12 @@ AC_DEFUN([gl_REGEX],
 
   AC_ARG_WITH([included-regex],
     [AC_HELP_STRING([--without-included-regex],
 
   AC_ARG_WITH([included-regex],
     [AC_HELP_STRING([--without-included-regex],

-                   [don't compile regex; this is the default on
+                   [don't compile regex; this is the default on 32-bit

                     systems with recent-enough versions of the GNU C
                     systems with recent-enough versions of the GNU C

-                    Library (use with caution on other systems)])])
+                    Library (use with caution on other systems).
+                    On systems with 64-bit ptrdiff_t and 32-bit int,
+                    --with-included-regex is the default, in case
+                    regex functions operate on very long strings (>2GB)])])

 
   case $with_included_regex in #(
   yes|no) ac_use_included_regex=$with_included_regex
 
   case $with_included_regex in #(
   yes|no) ac_use_included_regex=$with_included_regex