Re: Missing mbstate_t.m4 file in regex module

[Bruno Haible]

Ton Voon wrote:
> Thanks for a great library and really simple import tools.
> 
> We've found that the regex module is missing the mbstate_t.m4 file,  
> because it causes this compile error on HP-UX:
> 
> cc: "regex_internal.h", line 375: error 1000: Unexpected symbol:  
> "mbstate_t".
> 
> This addition into modules/regex appears to be sufficient:
> 
> Files:
> m4/mbstate_t.m4
> 
> configure.ac:
> AC_TYPE_MBSTATE_T

Thank you for reporting this. Since Paul Eggert (the owner of the regex module)
has not spoken up in 5 days, I take the freedom to apply essentially the same
fix as you propose:


2008-03-23  Bruno Haible  <address@hidden>

        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 <address@hidden>.

*** m4/regex.m4.orig    2008-03-23 23:41:25.000000000 +0100
--- m4/regex.m4 2008-03-23 23:37:16.000000000 +0100
***************
*** 1,7 ****
! #serial 48
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
! # 2006, 2007 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! #serial 49
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
! # 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,222 ****
--- 217,223 ----
  [
    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>])
  ])
*** modules/regex.orig  2008-03-23 23:41:25.000000000 +0100
--- modules/regex       2008-03-23 23:35:52.000000000 +0100
***************
*** 9,14 ****
--- 9,15 ----
  lib/regexec.c
  lib/regcomp.c
  m4/regex.m4
+ m4/mbstate_t.m4
  
  Depends-on:
  alloca