X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=eca417a455550d0fb53c95a8fa2272211fffc11d;hp=9050299cd5d632dd8d918a21ac09cd46004548b2;hb=9bbcd77cf9b66940058dbea1827db594e8ff6d7f;hpb=fb390e7a9112aa5f04f3e5eda5eaf33fdcc3b330

diff --git a/aclocal.m4 b/aclocal.m4
index 9050299..eca417a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -319,24 +319,30 @@ AC_SUBST(AlexVersion)
 # Sets the output variable LdCmd to the (non-Cygwin version of the) full path
 # of ld. Exits if no ld can be found
 AC_DEFUN([FP_PROG_LD],
-[AC_PATH_PROG([fp_prog_ld_raw], [ld])
-if test -z "$fp_prog_ld_raw"; then
-  AC_MSG_ERROR([cannot find ld in your PATH, no idea how to link])
+[
+if test -z "$1"
+then
+  AC_PATH_PROG([fp_prog_ld_raw], [ld])
+  if test -z "$fp_prog_ld_raw"; then
+    AC_MSG_ERROR([cannot find ld in your PATH, no idea how to link])
+  fi
+  LdCmd=$fp_prog_ld_raw
+  case $HostPlatform in
+    *mingw32) if test x${OSTYPE} != xmsys; then
+   	      LdCmd="`cygpath -w ${fp_prog_ld_raw} | sed -e 's@\\\\@/@g'`"
+                AC_MSG_NOTICE([normalized ld command to $LdCmd])
+              fi
+  	    # Insist on >= ld-2.15.x, since earlier versions doesn't handle
+  	    # the generation of relocatable object files with large amounts
+  	    # of relocations correctly. (cf. HSbase.o splittage-hack)
+  	    fp_prog_ld_version=`${LdCmd} --version | sed -n '/GNU ld/p' | tr -cd 0-9 | cut -b1-3`
+  	    FP_COMPARE_VERSIONS([$fp_prog_ld_version],[-lt],[214],
+                                  [AC_MSG_ERROR([GNU ld version later than 2.14 required to compile GHC on Windows.])])[]dnl
+              ;;
+  esac
+else
+  LdCmd="$1"
 fi
-LdCmd=$fp_prog_ld_raw
-case $HostPlatform in
-  *mingw32) if test x${OSTYPE} != xmsys; then
- 	      LdCmd="`cygpath -w ${fp_prog_ld_raw} | sed -e 's@\\\\@/@g'`"
-              AC_MSG_NOTICE([normalized ld command to $LdCmd])
-            fi
-	    # Insist on >= ld-2.15.x, since earlier versions doesn't handle
-	    # the generation of relocatable object files with large amounts
-	    # of relocations correctly. (cf. HSbase.o splittage-hack)
-	    fp_prog_ld_version=`${LdCmd} --version | sed -n '/GNU ld/p' | tr -cd 0-9 | cut -b1-3`
-	    FP_COMPARE_VERSIONS([$fp_prog_ld_version],[-lt],[214],
-                                [AC_MSG_ERROR([GNU ld version later than 2.14 required to compile GHC on Windows.])])[]dnl
-            ;;
-esac
 AC_SUBST([LdCmd])
 ])# FP_PROG_LD
 
@@ -605,6 +611,11 @@ echo foo > conftest.txt
 $fp_prog_find conftest.txt -print > conftest.out 2>&1
 if grep '^conftest.txt$' conftest.out > /dev/null 2>&1 ; then
   # OK, looks like a real "find".
+  if which cygpath 1> /dev/null 2> /dev/null
+  then
+    fp_prog_find=`cygpath --mixed "$fp_prog_find"`
+    AC_MSG_NOTICE([Converted to "$fp_prog_find"])
+  fi
   FindCmd="$fp_prog_find"
 else
   # Found a poor WinDoze version of "find", ignore it.
@@ -972,7 +983,10 @@ AC_DEFUN([FP_SETUP_PROJECT_VERSION],
 [
 if test "$RELEASE" = "NO"; then
     AC_MSG_CHECKING([for GHC version date])
-    if test -d _darcs; then
+    if test -f VERSION_DATE; then
+        PACKAGE_VERSION=${PACKAGE_VERSION}.`cat VERSION_DATE`
+        AC_MSG_RESULT(given $PACKAGE_VERSION)
+    elif test -d _darcs; then
         changequote(, )dnl
         ver_date=`darcs changes --quiet --no-summary --xml | head -500 | grep 'date=' | sed "s/^.*date='\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*$/\1/g" | sort -n | tail -1`
         if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else
@@ -980,10 +994,10 @@ if test "$RELEASE" = "NO"; then
                 AC_MSG_ERROR([failed to detect version date: check that darcs is in your path])
         fi
         PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date
-        AC_MSG_RESULT($PACKAGE_VERSION)
+        AC_MSG_RESULT(inferred $PACKAGE_VERSION)
     elif test -f VERSION; then
         PACKAGE_VERSION=`cat VERSION`
-        AC_MSG_RESULT($PACKAGE_VERSION)
+        AC_MSG_RESULT(given $PACKAGE_VERSION)
     else
         AC_MSG_WARN([cannot determine snapshot version: no _darcs directory and no VERSION file])
     fi
@@ -1054,4 +1068,26 @@ case $fptools_cv_timer_create_works in
 esac
 ])
 
+# FP_ARG_GMP
+# -------------
+AC_DEFUN([FP_ARG_GMP],
+[
+AC_ARG_WITH([gmp-includes],
+  [AC_HELP_STRING([--with-gmp-includes],
+    [directory containing gmp.h])],
+    [gmp_includes=$withval],
+    [gmp_includes=NONE])
+
+AC_ARG_WITH([gmp-libraries],
+  [AC_HELP_STRING([--with-gmp-libraries],
+    [directory containing gmp library])],
+    [gmp_libraries=$withval],
+    [gmp_libraries=NONE])
+])# FP_ARG_GMP
+
+AC_DEFUN([CHECK_GMP],
+[AC_REQUIRE([AC_PROG_CPP])
+AC_REQUIRE([AC_PROG_CC])
+])
+
 # LocalWords:  fi