Fix regex compilation error on HP-UX 11.

diff --git a/ChangeLog b/ChangeLog
index 433c875..80e9007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-03-23  Bruno Haible  <bruno@clisp.org>
 
+       Fix regex compilation error on HP-UX 11.
+       * m4/regex.m4 (gl_PREREQ_REGEX): Require AC_TYPE_MBSTATE_T.
+       * modules/regex (Files): Add m4/mbstate_t.m4.
+       Reported by Ton Voon <ton.voon@altinity.com>.
+
+2008-03-23  Bruno Haible  <bruno@clisp.org>
+
        * doc/gnulib-tool.texi (gettextize and autopoint): New section.
 
 2008-03-23  Eric Blake  <ebb9@byu.net>

diff --git a/m4/regex.m4 b/m4/regex.m4
index 7da6efe..4879bd8 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,7 +1,7 @@
-#serial 48
+#serial 49
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007 Free Software Foundation, Inc.
+# 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -217,6 +217,7 @@ AC_DEFUN([gl_PREREQ_REGEX],
 [
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([AC_C_RESTRICT])
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
   AC_CHECK_FUNCS_ONCE([isblank iswctype mbrtowc wcrtomb wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])

diff --git a/modules/regex b/modules/regex
index edbf6a1..d460ce2 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -9,6 +9,7 @@ lib/regex_internal.h
 lib/regexec.c
 lib/regcomp.c
 m4/regex.m4
+m4/mbstate_t.m4
 
 Depends-on:
 alloca