diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-04-16 12:10:16 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-04-16 12:10:16 +0200 |
| commit | d8fb6162b94aa556e0e150cc27d797d688a9e767 (patch) | |
| tree | 9966f8eea6e8084a9cbbeb2c4650306dd00ba8b1 /m4/strchrnul.m4 | |
| parent | 2aa729ac6af316bc30111144684a51c4650d5c44 (diff) | |
| download | gnulib-d8fb6162b94aa556e0e150cc27d797d688a9e767.tar.gz | |
strchrnul: Tweak last commit.
* doc/glibc-functions/strchrnul.texi: Add more details about Cygwin
bug.
* lib/string.in.h (strchrnul): Use same arguments in _GL_FUNCDECL_RPL
as in _GL_FUNCDECL_SYS.
* m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Invoke gl_PREREQ_STRCHRNUL after
AC_LIBOBJ. When cross-compiling, say "guessing yes" not "yes".
Diffstat (limited to 'm4/strchrnul.m4')
| -rw-r--r-- | m4/strchrnul.m4 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 52e50a121f..fbfd5aebd5 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -10,17 +10,16 @@ AC_DEFUN([gl_FUNC_STRCHRNUL], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS([strchrnul]) + AC_CHECK_FUNCS([strchrnul]) if test $ac_cv_func_strchrnul = no; then HAVE_STRCHRNUL=0 - gl_PREREQ_STRCHRNUL else AC_CACHE_CHECK([whether strchrnul works], [gl_cv_func_strchrnul_works], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <string.h> /* for strchrnul */ ]], [[const char *buf = "a"; - return strchrnul(buf, 'b') != buf + 1; + return strchrnul (buf, 'b') != buf + 1; ]])], [gl_cv_func_strchrnul_works=yes], [gl_cv_func_strchrnul_works=no], @@ -36,14 +35,18 @@ AC_DEFUN([gl_FUNC_STRCHRNUL], Lucky user #endif ], - [gl_cv_func_strchrnul_works=yes], + [gl_cv_func_strchrnul_works="guessing yes"], [gl_cv_func_strchrnul_works="guessing no"]) ]) ]) - if test "$gl_cv_func_strchrnul_works" != yes; then - REPLACE_STRCHRNUL=1 - AC_LIBOBJ([strchrnul]) - fi + case "$gl_cv_func_strchrnul_works" in + *yes) ;; + *) REPLACE_STRCHRNUL=1 ;; + esac + fi + if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then + AC_LIBOBJ([strchrnul]) + gl_PREREQ_STRCHRNUL fi ]) |