Remove leftover generated .h files after config.status changed.

[pspp] / m4 / glob.m4

diff --git a/m4/glob.m4 b/m4/glob.m4
index bc3e67cff1a624093be20c3b747072e955df9465..4b79148d3261188c7f4d254a958dc4fa9f4d961e 100644 (file)
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,5 +1,5 @@
-# glob.m4 serial 10
-dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
+# glob.m4 serial 12
+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.
@@ -10,11 +10,12 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_GLOB_SUBSTITUTE],
 [
+  AC_LIBOBJ([glob])
   gl_PREREQ_GLOB
 
   GLOB_H=glob.h
-  AC_LIBOBJ([glob])
   AC_SUBST([GLOB_H])
+  AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
 ])
 
 AC_DEFUN([gl_GLOB],
@@ -24,11 +25,11 @@ AC_DEFUN([gl_GLOB],
   if test -z "$GLOB_H"; then
     AC_CACHE_CHECK([for GNU glob interface version 1],
       [gl_cv_gnu_glob_interface_version_1],
-[     AC_COMPILE_IFELSE(
+[     AC_COMPILE_IFELSE([AC_LANG_SOURCE(
 [[#include <gnu-versions.h>
-char a[_GNU_GLOB_INTERFACE_VERSION == 1 ? 1 : -1];]],
-       [gl_cv_gnu_glob_interface_version_1=yes],
-       [gl_cv_gnu_glob_interface_version_1=no])])
+char a[_GNU_GLOB_INTERFACE_VERSION == 1 ? 1 : -1];]])],
+        [gl_cv_gnu_glob_interface_version_1=yes],
+        [gl_cv_gnu_glob_interface_version_1=no])])
 
     if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
       GLOB_H=glob.h
@@ -47,12 +48,12 @@ char a[_GNU_GLOB_INTERFACE_VERSION == 1 ? 1 : -1];]],
       fi
 
       if test $gl_cv_glob_lists_symlinks = maybe; then
-        AC_RUN_IFELSE(
+        AC_RUN_IFELSE([
 AC_LANG_PROGRAM(
 [[#include <stddef.h>
 #include <glob.h>]],
 [[glob_t found;
-if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]]),
+if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]])],
           [gl_cv_glob_lists_symlinks=yes],
           [gl_cv_glob_lists_symlinks=no], [gl_cv_glob_lists_symlinks=no])
       fi])
@@ -65,8 +66,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.*.