X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fglob.m4;h=689f777f9e98fc556cad30d7d72050ce54803ac4;hb=c43cc7b973f4daf0c59368ae52e130dfd12ce8d6;hp=1b4c97649df87406df947d6c5b25549e01b90dc2;hpb=3740c324b0f14e757b73cc22d88d30c4235d1bcb;p=gnulib.git

diff --git a/m4/glob.m4 b/m4/glob.m4
index 1b4c97649..689f777f9 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,5 +1,5 @@
-# glob.m4 serial 9
-dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
+# glob.m4 serial 14
+dnl Copyright (C) 2005-2007, 2009-2014 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])
@@ -24,11 +15,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 +38,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])
@@ -64,9 +55,8 @@ if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]]),
 
   rm -f conf$$-globtest
 
-  if test -n "$GLOB_H"; then
-    gl_GLOB_SUBSTITUTE
-  fi
+  AC_SUBST([GLOB_H])
+  AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
 ])
 
 # Prerequisites of lib/glob.*.
@@ -82,5 +72,5 @@ AC_DEFUN([gl_PREREQ_GLOB],
     HAVE_SYS_CDEFS_H=0
   fi
   AC_SUBST([HAVE_SYS_CDEFS_H])
-  AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
+  AC_CHECK_FUNCS_ONCE([fstatat getlogin_r getpwnam_r])dnl
 ])