diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-10-08 15:32:44 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-10-08 15:32:44 +0000 |
| commit | 8f3efaf77fe14ca3672a1c4a12fef52de9295b2b (patch) | |
| tree | 396f860eba3d218d26d41ec1b27e25a2b28f843f /aclocal.m4 | |
| parent | 86f656f4e6709947ac226aacc5a874b0a2c07bf1 (diff) | |
| download | haskell-8f3efaf77fe14ca3672a1c4a12fef52de9295b2b.tar.gz | |
Remove the windres configure check, now that we use an in-tree windres
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 097ff9c5af..f127b09cda 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 # ---------- |