diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-05-22 14:56:07 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-06-16 00:06:59 +0200 |
| commit | dc5910c0779fa08b8ea1d8864f997f4a446b15a1 (patch) | |
| tree | 104c5281496f0c2bde340acfeb437940a184a359 | |
| parent | 06c9266b0a6c3b4fb96b7a6e1ec158e2585e8c01 (diff) | |
| download | gnulib-dc5910c0779fa08b8ea1d8864f997f4a446b15a1.tar.gz | |
strverscmp: Move AC_LIBOBJ invocations to module description.
* m4/strverscmp.m4 (gl_FUNC_STRVERSCMP): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRVERSCMP invocations
from here...
* modules/strverscmp (configure.ac): ... to here.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/strverscmp.m4 | 5 | ||||
| -rw-r--r-- | modules/strverscmp | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2011-05-22 Bruno Haible <bruno@clisp.org> + strverscmp: Move AC_LIBOBJ invocations to module description. + * m4/strverscmp.m4 (gl_FUNC_STRVERSCMP): Call AC_CHECK_FUNCS instead of + AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRVERSCMP invocations + from here... + * modules/strverscmp (configure.ac): ... to here. + +2011-05-22 Bruno Haible <bruno@clisp.org> + strtok_r: Move AC_LIBOBJ invocations to module description. * m4/strtok_r.m4 (gl_FUNC_STRTOK_R): Set HAVE_STRTOK_R. Move AC_LIBOBJ and gl_PREREQ_STRTOK_R invocations from here... diff --git a/m4/strverscmp.m4 b/m4/strverscmp.m4 index 5d1a9bab12..394b4c3a84 100644 --- a/m4/strverscmp.m4 +++ b/m4/strverscmp.m4 @@ -1,4 +1,4 @@ -# strverscmp.m4 serial 7 +# strverscmp.m4 serial 8 dnl Copyright (C) 2002, 2005-2011 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,9 +10,8 @@ AC_DEFUN([gl_FUNC_STRVERSCMP], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS([strverscmp]) + AC_CHECK_FUNCS([strverscmp]) if test $ac_cv_func_strverscmp = no; then - gl_PREREQ_STRVERSCMP HAVE_STRVERSCMP=0 fi ]) diff --git a/modules/strverscmp b/modules/strverscmp index 33822c76e2..be0291fece 100644 --- a/modules/strverscmp +++ b/modules/strverscmp @@ -11,6 +11,10 @@ string configure.ac: gl_FUNC_STRVERSCMP +if test $HAVE_STRVERSCMP = 0; then + AC_LIBOBJ([strverscmp]) + gl_PREREQ_STRVERSCMP +fi gl_STRING_MODULE_INDICATOR([strverscmp]) Makefile.am: |