regex: Pass the system regex if its only problem is 32-bit regoff_t.

* NEWS: Document change.
* m4/regex.m4: Disable test for regoff_t size.

diff --git a/ChangeLog b/ChangeLog
index 9910da220e449575ba85c09c7a304bf7f1a60518..d42e017974f6ce0d02b21f5d13045687306d8efa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-10  Paolo Bonzini  <bonzini@gnu.org>
+
+       regex: Pass the system regex if its only problem is 32-bit regoff_t.
+       * NEWS: Document change.
+       * m4/regex.m4: Disable test for regoff_t size.
+
 2010-09-13  Jim Meyering  <meyering@redhat.com>
 
        fts: don't operate on an invalid file descriptor after failed dup

diff --git a/NEWS b/NEWS
index 6311533e0825885bd114a03df3dab7b742893e56..712408f3d2a6860bee5c4cf9e9e6e14d628e97c5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,13 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2010-09-13  regex           The module is not guaranteeing anymore support for
+                            64-bit regoff_t on 64-bit systems.  The size of
+                            regoff_t will always be 32-bit unless the program
+                            is being configured --with-included-regex.  This
+                            may change again in the future once glibc provides
+                            this feature as well.
+
 2010-09-12  savedir         The fdsavedir function is now deprecated.
 
 2010-09-10  fcntl-h         This module now defaults O_CLOEXEC to 0, and

diff --git a/m4/regex.m4 b/m4/regex.m4
index 95784e4b5840af636b15cd8bc3a0b46976210021..38f1dd76b61030a7afe77d8050a30a156d5ba695 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -158,12 +158,17 @@ AC_DEFUN([gl_REGEX],
             if (! REG_STARTEND)
               return 1;
 
-            /* Reject hosts whose regoff_t values are too narrow.
-               These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
-               and 32-bit int.  */
+#if 0
+            /* It would be nice to reject hosts whose regoff_t values are too
+               narrow (including glibc on hosts with 64-bit ptrdiff_t and
+               32-bit int), but we should wait until glibc implements this
+               feature.  Otherwise, support for equivalence classes and
+               multibyte collation symbols would always be broken except
+               when compiling --without-included-regex.   */
             if (sizeof (regoff_t) < sizeof (ptrdiff_t)
                 || sizeof (regoff_t) < sizeof (ssize_t))
               return 1;
+#endif
 
             return 0;]])],
        [gl_cv_func_re_compile_pattern_working=yes],