From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 12:56:07 +0000 (+0200)
Subject: strverscmp: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2405
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=dc5910c0779fa08b8ea1d8864f997f4a446b15a1;p=gnulib.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 5e4a54555..0562870e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 5d1a9bab1..394b4c3a8 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 33822c76e..be0291fec 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: