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 4b374c3da3d18ee921740d037e860070c4c43960..e038bc62dfcbed3830347d74bab44b737fe582da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        getusershell: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/glob.m4 b/m4/glob.m4
index 8dbfa9edb3c1f7e2e281b3e92c96868a51974ed4..5aaa6b4434a40ac993b5693394b00345278cf98a 100644 (file)
--- 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 db5410b51b3d684f3a0ec85ed1e4b081e694d462..2abadc09b822469ee3c55f2ca64cbea421af5410 100644 (file)
--- 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)