From b79beade410262f774c68398a4c659478c7f511e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 6 May 2011 01:03:00 +0200 Subject: [PATCH 2/8] 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. --- ChangeLog | 4 ++++ m4/argz.m4 | 7 +++---- modules/argz | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 635d739..44da525 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-05-05 Bruno Haible + 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. + alphasort: Move AC_LIBOBJ invocations to module description. * m4/alphasort.m4 (gl_FUNC_ALPHASORT): Move AC_LIBOBJ and gl_PREREQ_ALPHASORT invocations from here... diff --git a/m4/argz.m4 b/m4/argz.m4 index 0248a45..503301e 100644 --- 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 2cbb212..a8eb55e 100644 --- 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) -- 1.6.3.2