X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=9de8d1d81e0486350c55df5e8f3bfdd71741a9f0;hb=81cb7610337b33508066dd400cd371ff6033c987;hp=c339a849e5100b1729b2260428c6f8c2febc4154;hpb=ca9f59db55f686347d42e6e5938a24ce21521d2e;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index c339a84..9de8d1d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -24,28 +24,6 @@ AC_CHECK_DECLS([altzone], [], [],[#if TIME_WITH_SYS_TIME
 ])# FP_ALTZONE
 
 
-
-dnl *** Does libc contain GNU regex? ***
-dnl 
-AC_DEFUN(FPTOOLS_REGEX_IN_LIBC,
-[AC_CACHE_CHECK([for GNU regex in libc], fptools_cv_have_regex,
-[AC_TRY_LINK([#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <regex.h>
-],[ struct re_pattern_buffer patbuf; 
-    re_compile_pattern("",0,&patbuf);
-    re_search_2 (&patbuf, "", 0, "",0, 0,0,0,0); ],
-fptools_cv_have_regex=yes, fptools_cv_have_regex=no)])
-if test "$fptools_cv_have_regex" = yes; then
-	HaveGNURegex=YES
-else
-	HaveGNURegex=NO
-fi
-AC_SUBST(HaveGNURegex)
-])
-
-
 dnl ** check for leading underscores in symbol names
 dnl 
 dnl Test for determining whether symbol names have a leading
@@ -307,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
@@ -1184,19 +1129,6 @@ dnl and we don't want to be global namespace polluters.
 
 # LocalWords:  fi
 
-dnl 
-dnl acspecific.m4's defn of AC_PROG_LEX is a bit too permissive, as it
-dnl defaults to 'lex' if 'flex' isn't found (without checking whether
-dnl 'lex' is actually present along the user's PATH).
-dnl
-AC_DEFUN(AC_PROG_LEX_STRICT,
-[AC_CHECK_PROG(LEX, flex, flex)
-if test -z "$LEX"
-then
-  AC_CHECK_PROG(LEX,lex,lex)
-  test -z "$LEX" && AC_MSG_ERROR(['lex' or 'flex' is required to compile GHC.])
-fi
-])
 
 dnl
 dnl Check to see whether CC (gcc) supports a particular option.