regex fixes for future POSIX and --without-included-regex.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b0560f1..c922719 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * regex.h (regoff_t) [defined _REGEX_LARGE_OFFSETS]:
+       Typedef to long int, not to off_, as POSIX will likely change
+       in that direction.
+
 2006-03-12  Jim Meyering  <jim@meyering.net>
 
        * fts-cycle.c (leave_dir): If cycle-check's saved dev-ino pair matches

diff --git a/m4/ChangeLog b/m4/ChangeLog
index d78cde5..949cbda 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * regex.m4 (gl_REGEX): Don't check for off_t, since the code
+       no longer needs it.  Instead, check that regoff_t is as least
+       as wide as ptrdiff_t.
+
+       Don't define _REGEX_WIDE_OFFSETS unless using the included regex,
+       so that our regex.h stays compatible with the installed regex.
+       This is helpful for installers who configure --without-included-regex.
+       Problem reported by Emanuele Giaquinta.
+
 2006-03-12  Jim Meyering  <jim@meyering.net>
 
        * chdir-safer.m4 (gl_CHDIR_SAFER): Add same-inode.h to the list.