X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fbison.m4;h=87c090ed8ab0791da1bcaf43618853edb2b62ffd;hb=2d86779b66c22650afcf6041018d40257445979a;hp=892293a1f1b9ce74eb3fffb3f36e94e95200a14c;hpb=3d19425307a2325ba751f42a7226c2df068c48aa;p=gnulib.git

diff --git a/m4/bison.m4 b/m4/bison.m4
index 892293a1f..87c090ed8 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,23 +1,24 @@
-#serial 4
+# serial 6
 
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 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.
-  AM_MISSING_PROG(YACC, bison -y)
-  AC_ARG_VAR(YACC,
+  # parse-datetime.y works with bison only.
+  : ${YACC='bison -y'}
+dnl
+dnl Declaring YACC & YFLAGS precious will not be necessary after GNULIB
+dnl requires an Autoconf greater than 2.59c, but it will probably still be
+dnl useful to override the description of YACC in the --help output, re
+dnl parse-datetime.y assuming `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,
+Values other than `bison -y' will most likely break on most systems.])dnl
+  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.])
+`-d' given by some make applications.])dnl
 ])