argz: Move AC_LIBOBJ invocations to module description.

* m4/argz.m4 (gl_FUNC_ARGZ): Move AC_LIBOBJ invocation from here...
* modules/argz (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 0557d7d53e90837a088ed53a356236dd697e68a5..5438458c0bcee6d26275f8652c7f10e654cebd2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
+       argz: Move AC_LIBOBJ invocations to module description.
+       * m4/argz.m4 (gl_FUNC_ARGZ): Move AC_LIBOBJ invocation from here...
+       * modules/argz (configure.ac): ... to here.
+
 2011-05-05  Bruno Haible  <bruno@clisp.org>
 
        alphasort: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/argz.m4 b/m4/argz.m4
index 0248a453da7d5c1d62854f5b7e929cfdce65109b..503301e54629b5a1799c61717505b72bec7c9cd9 100644 (file)
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -7,7 +7,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 9 argz.m4
+# serial 10 argz.m4
 
 AC_DEFUN([gl_FUNC_ARGZ],
 [gl_PREREQ_ARGZ
@@ -27,7 +27,7 @@ AC_CHECK_TYPES([error_t],
 #endif])
 
 ARGZ_H=
-AC_CHECK_FUNC([argz_replace], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
+AC_CHECK_FUNC([argz_replace], [], [ARGZ_H=argz.h])
 
 dnl if have system argz functions, allow forced use of
 dnl libltdl-supplied implementation (and default to do so
@@ -70,8 +70,7 @@ AS_IF([test -z "$ARGZ_H"],
      AS_IF([test "$lt_cv_sys_argz_works" = yes],
         [AC_DEFINE([HAVE_WORKING_ARGZ], [1],
                    [This value is set to 1 to indicate that the system argz facility works])],
-        [ARGZ_H=argz.h
-        AC_LIBOBJ([argz])])])
+        [ARGZ_H=argz.h])])
 
 AC_SUBST([ARGZ_H])
 AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n "$ARGZ_H"])

diff --git a/modules/argz b/modules/argz
index 2cbb2123e3a2d15acd070a6495a837c19f26e688..a8eb55e9444931034e53858f785549b2cf1c84b1 100644 (file)
--- a/modules/argz
+++ b/modules/argz
@@ -16,6 +16,9 @@ strstr          [test -n "$ARGZ_H"]
 
 configure.ac:
 gl_FUNC_ARGZ
+if test -n "$ARGZ_H"; then
+  AC_LIBOBJ([argz])
+fi
 
 Makefile.am:
 BUILT_SOURCES += $(ARGZ_H)