X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=e7adaff8c388bee880b4bd8a4810006ffedf26d4;hb=a6ba9700a96d623ddac728ed7e4df4ebe32ac99a;hp=bf88bd77da98277ea73cf83ed108950d42bd2845;hpb=d84757e30d8578aaa788c26f0245c67ab482d0f9;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index bf88bd7..e7adaff 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -244,7 +244,7 @@ else
 fi;
 changequote([, ])dnl
 ])
-if test ! -f compiler/parser/Parser.hs || test ! -f compiler/main/ParsePkgConf.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs
+if test ! -f compiler/parser/Parser.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs
 then
     FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.16],
       [AC_MSG_ERROR([Happy version 1.16 or later is required to compile GHC.])])[]
@@ -289,45 +289,6 @@ AC_SUBST(AlexVersion)
 ])
 
 
-dnl
-dnl Check for windres and version.
-dnl 2.15.91 works
-dnl 2.17.50 doesn't work
-dnl 2.18.50 works
-dnl
-AC_DEFUN([FPTOOLS_WINDRES],
-[
-if test "x$HostPlatform"  = "xi386-unknown-mingw32"
-then
-    AC_PATH_PROG(WindResCmd,windres,)
-    # Alex is passed to Cabal, so we need a native path
-    if test "${OSTYPE}"      != "msys"                  && \
-       test "${WindResCmd}"  != ""
-    then
-        # Canonicalise to <drive>:/path/to/gcc
-        WindResCmd=`cygpath -m ${WindResCmd}`
-    fi
-
-    AC_CACHE_CHECK([for version of windres], fptools_cv_windres_version,
-    changequote(, )dnl
-    [
-        if test x"$WindResCmd" != x
-        then
-            fptools_cv_windres_version="`$WindResCmd --version |
-			  grep 'GNU windres' |
-              sed -e 's/GNU windres[^0-9]* \([0-9\.]*\).*/\1/g'`" ;
-        else
-            fptools_cv_windres_version="";
-        fi
-        changequote([, ])dnl
-    ])
-    FP_COMPARE_VERSIONS([$fptools_cv_windres_version],[-eq],[2.17.50],
-      [AC_MSG_ERROR([Your windres version isn't compatible with GHC. 2.15.91 and 2.18.50 are known to work.])])[]
-    WindResVersion=$fptools_cv_windres_version;
-    AC_SUBST(WindResVersion)
-fi
-])
-
 
 # FP_PROG_LD
 # ----------
@@ -577,20 +538,6 @@ AC_SUBST([GccVersion], [$fp_cv_gcc_version])
 AC_SUBST(GccLT34)
 ])# FP_HAVE_GCC
 
-AC_DEFUN([FP_MINGW_GCC],
-[
-  case $HostOS_CPP in
-    mingw*)  AC_MSG_CHECKING([whether $CC is a mingw gcc])
-	     if $CC -v 2>&1 | grep mingw >/dev/null; then
-		AC_MSG_RESULT([yes])
-	     else
-		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([Please use --with-gcc to specify a mingw gcc])
-	     fi;;
-    *) ;;	
-  esac
-])
-
 dnl Small feature test for perl version. Assumes PerlCmd
 dnl contains path to perl binary.
 dnl