[project @ 2003-08-18 13:54:04 by panne]

Nuked unused FPTOOLS_PROG_YACCY test and support for yacc/bison in
general. If it is ever needed again, it can easily be resurrected.

diff --git a/aclocal.m4 b/aclocal.m4
index 4f3259c..16a36cf 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -285,39 +285,6 @@ fi
 AC_SUBST(LdXFlag)
 ])
 
-dnl
-dnl Finding the Right Yacc
-dnl
-AC_DEFUN(FPTOOLS_PROG_YACCY,
-[AC_PROG_YACC
-if test "$YACC" = "yacc"; then
-   AC_CACHE_CHECK([if it is an OK yacc], ac_cv_prog_yacc,
-   [AC_CHECK_PROG(WhatCmd, what, what, :)
-    $WhatCmd $YACC > conftest.out
-    if egrep 'y1\.c 1\..*SMI' conftest.out >/dev/null 2>&1; then
-        echo "I don't trust your $YaccCmd; it looks like an old Sun yacc"
-        if test -f /usr/lang/yacc; then
-           echo "I'm going to use /usr/lang/yacc instead"
-           ac_cv_prog_yacc=/usr/lang/yacc
-        else
-           echo "I'm assuming the worst...no parser generator at all"
-           ac_cv_prog_yacc=:
-        fi
-    elif egrep 'y1\.c.*Revision: 4\.2\.6\.3.*DEC' conftest.out >/dev/null 2>&1; then
-        echo "I don't trust your $YaccCmd; it looks like a lame DEC yacc"
-        echo "I'm assuming the worst...no parser generator at all"
-        ac_cv_prog_yacc=:
-    else
-       ac_cv_prog_yacc=$YACC
-    fi
-    rm -fr conftest*
-])
-else
-    ac_cv_prog_yacc=$YACC
-fi
-YaccCmd=$ac_cv_prog_yacc
-AC_SUBST(YaccCmd)
-])
 
 dnl *** Checking for ar and its arguments + whether we need ranlib.
 dnl

diff --git a/configure.ac b/configure.ac
index 4f1e152..f4e7d6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -656,11 +656,6 @@ FPTOOLS_PROG_DIFF
 dnl ** Find find command (for Win32's benefit)
 FPTOOLS_FIND_FIND
 
-dnl ** look for a decent parser generator (bison preferred)
-dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing 
-dnl  on the suitability of the 'yacc' returned.)
-FPTOOLS_PROG_YACCY
-
 dnl ** Find lex command (lex or flex) - *doesn't* use autoconf's
 dnl    AC_PROG_LEX, since it doesn't actually check whether 'lex'
 dnl    exists if 'flex' doesn't.

diff --git a/docs/building/building.sgml b/docs/building/building.sgml
index 9765ba3..25703f9 100644 (file)
--- a/docs/building/building.sgml
+++ b/docs/building/building.sgml
@@ -1589,7 +1589,7 @@ $ make install
             round your computer working out what architecture it has,
             what operating system, whether it has the
             <Function>vfork</Function> system call, where
-            <command>yacc</command> is kept, whether
+            <command>tar</command> is kept, whether
             <command>gcc</command> is available, where various obscure
             <literal>&num;include</literal> files are, whether it's a
             leap year, and what the systems manager had for lunch.  It
@@ -1769,17 +1769,17 @@ GhcHcOpts=-DDEBUG -Rghc-timing
       For example, there's a line that says:</para>
 
 <ProgramListing>
-YACC = @YaccCmd@
+TAR = @TarCmd@
 </ProgramListing>
 
-      <para>This defines the Make variables <constant>YACC</constant>
-      to the pathname for a <command>yacc</command> that
+      <para>This defines the Make variables <constant>TAR</constant>
+      to the pathname for a <command>tar</command> that
       <command>configure</command> finds somewhere.  If you have your
-      own pet <command>yacc</command> you want to use instead, that's
+      own pet <command>tar</command> you want to use instead, that's
       fine. Just add this line to <filename>mk/build.mk</filename>:</para>
 
 <ProgramListing>
-YACC = myyacc
+TAR = mytar
 </ProgramListing>
 
       <para>You do not <emphasis>have</emphasis> to have a

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5572f93..4ad34d2 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -809,7 +809,6 @@ TIB                 = tib
 TIME                   = @TimeCmd@
 TROFF                  = troff
 UNAME                  = uname
-YACC                   = @YaccCmd@
 
 #-----------------------------------------------------------------------------
 # SGML stuff

diff --git a/mk/opts.mk b/mk/opts.mk
index 7bdeb43..bfa0ef0 100644 (file)
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #      This file defines Make variables for the
 #      option flags for each utility program
 #
-#      $Id: opts.mk,v 1.32 2003/08/13 12:34:46 simonmar Exp $
+#      $Id: opts.mk,v 1.33 2003/08/18 13:54:06 panne Exp $
 #
 #################################################################################
 
@@ -18,7 +18,7 @@
 #              AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT 
 #              LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM
 #              MKDEPENDC MKDEPENDHS MKDEPENDLIT MSUB
-#              RUNTEST UNLIT YACC          
+#              RUNTEST UNLIT          
 
 
 # For each such utility program P, this file defines
@@ -105,7 +105,6 @@ SGML2PDF_OPTS      = $(SRC_SGML2PDF_OPTS) $(WAY$(_way)_SGML2PDF_OPTS) $(EXTRA_SG
 SGML2RTF_OPTS      = $(SRC_SGML2RTF_OPTS) $(WAY$(_way)_SGML2RTF_OPTS) $(EXTRA_SGML2RTF_OPTS)
 SGML2HTML_OPTS     = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_SGML2HTML_OPTS)
 UNLIT_OPTS         = $(SRC_UNLIT_OPTS) $(WAY$(_way)_UNLIT_OPTS) $(EXTRA_UNLIT_OPTS)
-YACC_OPTS          = $(SRC_YACC_OPTS) $(WAY$(_way)_YACC_OPTS) $(EXTRA_YACC_OPTS)
 ZIP_OPTS           = $(SRC_ZIP_OPTS) $(EXTRA_ZIP_OPTS)
 
 # Version of CC_OPTS to use when GHC is the C compiler

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 2e1bc8e..3fddbd8 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -234,18 +234,6 @@ endif
        $(FLEX) -t $(FLEX_OPTS) $< > $@
 
 #-----------------------------------------------------------------------------
-# Yacc stuff
-
-%.tab.c %.tab.h : %.y
-       @$(RM) $*.tab.h $*.tab.c y.tab.c y.tab.h y.output
-       $(YACC) $(YACC_OPTS) $<
-       $(MV) y.tab.c $*.tab.c
-       @chmod 444 $*.tab.c
-       $(MV) y.tab.h $*.tab.h
-       @chmod 444 $*.tab.h
-
-
-#-----------------------------------------------------------------------------
 # Runtest rules for calling $(HC) on a single-file Haskell program
 
 %.runtest : %.hs