X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fbison.m4;h=260cba6a60b42b3b55f5112afb10baac6e72a9d1;hb=8924d470065e554cb4532df49ba159ffdf8c1b32;hp=228ae4c5a6ca298871437577a1f845fb62cecef9;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/bison.m4 b/m4/bison.m4
index 228ae4c5a..260cba6a6 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,8 +1,24 @@
-#serial 2
+# serial 5
 
-AC_DEFUN([jm_BISON],
+# Copyright (C) 2002, 2005, 2009, 2010 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],
 [
   # getdate.y works with bison only.
   : ${YACC='bison -y'}
-  AC_SUBST(YACC)
+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 getdate.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.])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.])dnl
 ])