X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fglob.m4;h=8dbfa9edb3c1f7e2e281b3e92c96868a51974ed4;hb=7f68b5ace68d29f3627ce2e3a1e8966aea5ec778;hp=78bdcdeb3edd27baff2c1d94cf9c840913126396;hpb=78ea303984ba7645db05acd15b68f771669e58ea;p=gnulib.git

diff --git a/m4/glob.m4 b/m4/glob.m4
index 78bdcdeb3..8dbfa9edb 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,5 +1,5 @@
-# glob.m4 serial 11
-dnl Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
+# glob.m4 serial 13
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,15 +8,6 @@ dnl with or without modifications, as long as this notice is preserved.
 # rather than vanilla POSIX glob.  This means your code should
 # always include <glob.h> for the glob prototypes.
 
-AC_DEFUN([gl_GLOB_SUBSTITUTE],
-[
-  gl_PREREQ_GLOB
-
-  GLOB_H=glob.h
-  AC_LIBOBJ([glob])
-  AC_SUBST([GLOB_H])
-])
-
 AC_DEFUN([gl_GLOB],
 [ GLOB_H=
   AC_CHECK_HEADERS([glob.h], [], [GLOB_H=glob.h])
@@ -65,8 +56,11 @@ if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]])],
   rm -f conf$$-globtest
 
   if test -n "$GLOB_H"; then
-    gl_GLOB_SUBSTITUTE
+    AC_LIBOBJ([glob])
+    gl_PREREQ_GLOB
   fi
+  AC_SUBST([GLOB_H])
+  AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
 ])
 
 # Prerequisites of lib/glob.*.