--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-31  Derek Price  <derek@ximbiot.com>
+	    Paul Eggert  <eggert@cs.ucla.edu>
+
+	Sync from cvs.
+	* glob.m4: s/MISSING_SYS_CDEFS_H/_SYS_CDEFS_H/ and comment.
+
 2005-05-29  Derek Price  <derek@ximbiot.com>
 	    Paul Eggert  <eggert@cs.ucla.edu>
 

--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -7,7 +7,17 @@
 
 AC_DEFUN([gl_BISON],
 [
+dnl All this cruft, which tries to fail harmlessly when bison is not present,
+dnl will no longer be necessary after we require an Automake release 1.10 or
+dnl later, as those avoid generating .c files from .y when not in maintainer
+dnl mode.  This is currently a fork from the GNULIB version of this file.
   # getdate.y works with bison only.
-  : ${YACC='bison -y'}
-  AC_SUBST(YACC)
+  AM_MISSING_PROG(YACC, bison -y)
+  AC_ARG_VAR(YACC,
+[The `Yet Another C Compiler' implementation to use.  Defaults to `bison -y'.
+Values other than `bison -y' will most likely break on most systems.])
+  AC_ARG_VAR(YFLAGS,
+[YFLAGS contains the list arguments that will be passed by default to Bison.
+This script will default YFLAGS to the empty string to avoid a default value of
+`-d' given by some make applications.])
 ])

--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -43,8 +43,15 @@
   AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
   AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
   AC_CHECK_HEADERS([sys/cdefs.h], [SYS_CDEFS_H=yes], [SYS_CDEFS_H=no])
+
+  dnl Note the reversal of the common HAVE_SYS_CDEFS_H idiom below.  In this
+  dnl way, #ifndef _SYS_CDEFS_H may be used to include <sys/cdefs.h> both when
+  dnl it has been checked for via the GNULIB configure test and found and when
+  dnl it has not been checked for, which we can presume means that the <glob.h>
+  dnl GNULIB shares with GLIBC is being included as a system header and not as
+  dnl part of GNULIB, in which case <sys/cdefs.h> may be assumed.
   if test $SYS_CDEFS_H = no; then
-    AC_DEFINE(MISSING_SYS_CDEFS_H, 1,
+    AC_DEFINE(_SYS_CDEFS_H, 1,
       [Define to `1' if <sys/cdefs.h> is *not* available on this system.])
   fi
   :])