On Windows, check that we have a good version of windres when configuring

diff --git a/aclocal.m4 b/aclocal.m4
index 758f319..c49271d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -289,6 +289,46 @@ 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.])])[]dnl
+    indResVersion=$fptools_cv_windres_version;
+    AC_SUBST(WindResVersion)
+fi
+])
+
+

 # FP_PROG_LD
 # ----------
 # Sets the output variable LdCmd to the (non-Cygwin version of the) full path
 # FP_PROG_LD
 # ----------
 # Sets the output variable LdCmd to the (non-Cygwin version of the) full path

diff --git a/configure.ac b/configure.ac
index 3e48e23..b3d1b32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1009,6 +1009,9 @@ if test "$BootingFromHc" = "NO"; then
 FPTOOLS_ALEX
 fi;
 
 FPTOOLS_ALEX
 fi;
 

+dnl Check we have an acceptable version of windres
+FPTOOLS_WINDRES
+

 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------
 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------