$NetBSD: patch-ab,v 1.1 2007/08/06 12:54:26 gdt Exp $

--- configure.orig	2007-08-02 00:53:15.000000000 -0400
+++ configure
@@ -854,7 +854,6 @@ LEX
 LEX_OUTPUT_ROOT
 LEXLIB
 YACC
-YFLAGS
 build
 build_cpu
 build_vendor
@@ -903,8 +902,6 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-YACC
-YFLAGS
 CXX
 CXXFLAGS
 CCC
@@ -1522,11 +1519,6 @@ Some influential environment variables:
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-              the first program found out of: `bison -y', `byacc', `yacc'.
-  YFLAGS      The list of arguments that will be passed by default to $YACC.
-              This script will default YFLAGS to the empty string to avoid a
-              default value of `-d' given by some make applications.
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
@@ -4101,7 +4093,7 @@ if test -z "${ac_cv_prog_LEX}" ; then
 echo "$as_me: error: Build requires flex or lex lexical analyzer generator" >&2;}
    { (exit 1); exit 1; }; }
 fi
-for ac_prog in 'bison -y' byacc
+for ac_prog in 'bison -y' byacc yacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4142,13 +4134,7 @@ fi
 
   test -n "$YACC" && break
 done
-test -n "$YACC" || YACC="yacc"
 
-if test -z "${ac_cv_prog_YACC}" ; then
-    { { echo "$as_me:$LINENO: error: Build requires bison, byacc or yacc parser generator" >&5
-echo "$as_me: error: Build requires bison, byacc or yacc parser generator" >&2;}
-   { (exit 1); exit 1; }; }
-fi
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -22928,7 +22914,6 @@ LEX!$LEX$ac_delim
 LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 LEXLIB!$LEXLIB$ac_delim
 YACC!$YACC$ac_delim
-YFLAGS!$YFLAGS$ac_delim
 build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
@@ -22938,6 +22923,7 @@ host_cpu!$host_cpu$ac_delim
 host_vendor!$host_vendor$ac_delim
 host_os!$host_os$ac_delim
 SED!$SED$ac_delim
+GREP!$GREP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22979,7 +22965,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
@@ -23010,7 +22995,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
