From: Ian Lynagh <igloo@earth.li>
Date: Thu, 8 Oct 2009 15:32:44 +0000 (+0000)
Subject: Remove the windres configure check, now that we use an in-tree windres
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=8f3efaf77fe14ca3672a1c4a12fef52de9295b2b

Remove the windres configure check, now that we use an in-tree windres
---

diff --git a/aclocal.m4 b/aclocal.m4
index 097ff9c..f127b09 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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
 # ----------
diff --git a/configure.ac b/configure.ac
index 3fb728b..a08c269 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,9 +568,6 @@ if test "$BootingFromHc" = "NO"; then
 FPTOOLS_ALEX
 fi;
 
-dnl Check we have an acceptable version of windres
-FPTOOLS_WINDRES
-
 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------