diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-12-02 00:42:52 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-12-02 00:42:52 +0000 |
| commit | 76bebf24a531f7019ba6369eb5eafe34c2992882 (patch) | |
| tree | 49f0a2466e3dceb957fee8fb154d7cba140f2f87 /m4 | |
| parent | b3c0bca1f8a793e886889f711a11d4490b8cab85 (diff) | |
| download | coreutils-76bebf24a531f7019ba6369eb5eafe34c2992882.tar.xz | |
Import from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 15 | ||||
| -rw-r--r-- | m4/mbchar.m4 | 15 | ||||
| -rw-r--r-- | m4/mbiter.m4 | 5 | ||||
| -rw-r--r-- | m4/strcase.m4 | 5 | ||||
| -rw-r--r-- | m4/strstr.m4 | 5 |
5 files changed, 32 insertions, 13 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 78cfe5128..fcc9f2af6 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,18 @@ +2005-12-01 Paul Eggert <eggert@cs.ucla.edu> + + * regex.m4 (gl_REGEX): Check whether off_t can be used in a switch + statement, to work around an HP-UX 10.20 compiler bug reported by + Peter O'Gorman. + +2005-12-01 Bruno Haible <bruno@clisp.org> + + Import from gnulib. + * mbchar.m4 (gl_MBCHAR): Check for wchar.h and wctype.h. Don't compile + mbchar.c if they are not both present. + * mbiter.m4 (gl_MBITER): Likewise. + * strstr.m4 (gl_PREREQ_STRSTR): Use AC_REQUIRE. + * strcase.m4 (gl_PREREQ_STRCASECMP): Likewise. + 2005-11-30 Jim Meyering <jim@meyering.net> * openat.m4 (gl_FUNC_OPENAT): Require and compile mkdirat.c. diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index 7657b6974..df351a6eb 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -9,13 +9,12 @@ dnl From Bruno Haible. AC_DEFUN([gl_MBCHAR], [ - AC_CHECK_HEADERS_ONCE(wchar.h wctype.h) - - case $ac_cv_header_wchar_h,$ac_cv_header_wctype_h in - yes,yes) - AC_LIBOBJ([mbchar]);; - esac - AC_REQUIRE([AC_GNU_SOURCE]) - : + dnl The following line is that so the user can test + dnl HAVE_WCHAR_H && HAVE_WCTYPE_H before #include "mbchar.h". + AC_CHECK_HEADERS_ONCE(wchar.h wctype.h) + dnl Compile mbchar.c only if HAVE_WCHAR_H && HAVE_WCTYPE_H. + if test $ac_cv_header_wchar_h = yes && test $ac_cv_header_wctype_h = yes; then + AC_LIBOBJ([mbchar]) + fi ]) diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 3eb92bcca..7d51af10d 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,4 +1,4 @@ -# mbiter.m4 serial 1 +# mbiter.m4 serial 2 dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,5 +10,8 @@ dnl From Bruno Haible. AC_DEFUN([gl_MBITER], [ AC_REQUIRE([AC_TYPE_MBSTATE_T]) + dnl The following line is that so the user can test HAVE_MBRTOWC before + dnl #include "mbiter.h" or "mbuiter.h". + AC_REQUIRE([gl_FUNC_MBRTOWC]) : ]) diff --git a/m4/strcase.m4 b/m4/strcase.m4 index 8a8ff3a45..6db401bb1 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,4 +1,4 @@ -# strcase.m4 serial 2 +# strcase.m4 serial 3 dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,7 +29,8 @@ AC_DEFUN([gl_FUNC_STRNCASECMP], # Prerequisites of lib/strcasecmp.c. AC_DEFUN([gl_PREREQ_STRCASECMP], [ - gl_FUNC_MBRTOWC + AC_REQUIRE([gl_FUNC_MBRTOWC]) + : ]) # Prerequisites of lib/strncasecmp.c. diff --git a/m4/strstr.m4 b/m4/strstr.m4 index aea809ebd..a785d4286 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 4 +# strstr.m4 serial 5 dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,5 +14,6 @@ AC_DEFUN([gl_FUNC_STRSTR], # Prerequisites of lib/strstr.c. AC_DEFUN([gl_PREREQ_STRSTR], [ - gl_FUNC_MBRTOWC + AC_REQUIRE([gl_FUNC_MBRTOWC]) + : ]) |