diff options
| author | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
| commit | 13770d8553f9696c1c4c0c56703717524c028d86 (patch) | |
| tree | 23c9f11f0407207ad24a8f7a4f6c72d52d0e7822 /m4/strnlen.m4 | |
| parent | 6ff1bbbd0deeac54175fc862a6e1b53374ae6306 (diff) | |
| parent | b6e0b7972e3dbdace0034d439b992faf3ac8c454 (diff) | |
Merge branch 'master' into tom/speed
Conflicts:
.gitignore
Diffstat (limited to 'm4/strnlen.m4')
| -rw-r--r-- | m4/strnlen.m4 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index a1c59ac6..d97e3075 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ -# strnlen.m4 serial 12 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, +# 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, @@ -16,16 +16,14 @@ AC_DEFUN([gl_FUNC_STRNLEN], if test $ac_cv_have_decl_strnlen = no; then HAVE_DECL_STRNLEN=0 else - AC_FUNC_STRNLEN + 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 - if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then - AC_LIBOBJ([strnlen]) - gl_PREREQ_STRNLEN - fi ]) # Prerequisites of lib/strnlen.c. |