diff options
Diffstat (limited to 'm4/strnlen.m4')
| -rw-r--r-- | m4/strnlen.m4 | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index 67964c8d..d97e3075 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,29 +1,30 @@ -# strnlen.m4 serial 5 -dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc. +# strnlen.m4 serial 13 +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRNLEN], [ - AC_LIBSOURCES([strnlen.c, strnlen.h]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) dnl Persuade glibc <string.h> to declare strnlen(). - AC_REQUIRE([AC_GNU_SOURCE]) + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_FUNC_STRNLEN - if test $ac_cv_func_strnlen_working = no; then - # This is necessary because automake-1.6.1 doens't understand - # that the above use of AC_FUNC_STRNLEN means we may have to use - # lib/strnlen.c. - #AC_LIBOBJ(strnlen) - AC_DEFINE(strnlen, rpl_strnlen, - [Define to rpl_strnlen if the replacement function should be used.]) - gl_PREREQ_STRNLEN + AC_CHECK_DECLS_ONCE([strnlen]) + if test $ac_cv_have_decl_strnlen = no; then + HAVE_DECL_STRNLEN=0 + else + m4_pushdef([AC_LIBOBJ], [:]) + dnl Note: AC_FUNC_STRNLEN does AC_LIBOBJ([strnlen]). + AC_FUNC_STRNLEN + m4_popdef([AC_LIBOBJ]) + if test $ac_cv_func_strnlen_working = no; then + REPLACE_STRNLEN=1 + fi fi ]) # Prerequisites of lib/strnlen.c. -AC_DEFUN([gl_PREREQ_STRNLEN], [ - AC_CHECK_DECLS_ONCE(strnlen) -]) +AC_DEFUN([gl_PREREQ_STRNLEN], [:]) |