From: Bruno Haible Date: Sun, 8 May 2011 17:36:38 +0000 (+0200) Subject: glob: Move AC_LIBOBJ invocations to module description. X-Git-Tag: v0.1~2549 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=e2612b9372065ea4a2216af8cb46dc2d91fa1dd1;p=gnulib.git glob: Move AC_LIBOBJ invocations to module description. * m4/glob.m4 (gl_GLOB): Move AC_LIBOBJ and gl_PREREQ_GLOB invocations from here... * modules/glob (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index 4b374c3da..e038bc62d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-08 Bruno Haible + glob: Move AC_LIBOBJ invocations to module description. + * m4/glob.m4 (gl_GLOB): Move AC_LIBOBJ and gl_PREREQ_GLOB invocations + from here... + * modules/glob (configure.ac): ... to here. + +2011-05-08 Bruno Haible + getusershell: Move AC_LIBOBJ invocations to module description. * m4/getusershell.m4 (gl_FUNC_GETUSERSHELL): Set HAVE_GETUSERSHELL. Move AC_LIBOBJ invocation from here... diff --git a/m4/glob.m4 b/m4/glob.m4 index 8dbfa9edb..5aaa6b443 100644 --- a/m4/glob.m4 +++ b/m4/glob.m4 @@ -1,4 +1,4 @@ -# glob.m4 serial 13 +# glob.m4 serial 14 dnl Copyright (C) 2005-2007, 2009-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, @@ -55,10 +55,6 @@ if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]])], rm -f conf$$-globtest - if test -n "$GLOB_H"; then - AC_LIBOBJ([glob]) - gl_PREREQ_GLOB - fi AC_SUBST([GLOB_H]) AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"]) ]) diff --git a/modules/glob b/modules/glob index db5410b51..2abadc09b 100644 --- a/modules/glob +++ b/modules/glob @@ -28,6 +28,10 @@ malloc-posix [test -n "$GLOB_H"] configure.ac: gl_GLOB +if test -n "$GLOB_H"; then + AC_LIBOBJ([glob]) + gl_PREREQ_GLOB +fi Makefile.am: BUILT_SOURCES += $(GLOB_H)