[project @ 2001-10-24 10:05:51 by rrt]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index f0376d9..b7e9464 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -346,17 +346,19 @@ dnl use either is considered a Feature.
 
 dnl ** What command to use to compile compiler sources ?
 dnl --------------------------------------------------------------
-if test "$GHC" = ""; then
-  AC_PATH_PROG(GHC,ghc)
-fi
 
 AC_ARG_WITH(ghc,
 [  --with-ghc=<haskell compiler>
         Use a command different from 'ghc' to compile GHC-specific Haskell code
            (including GHC itself).
 ],
-[WithGhc="$withval"],
-[WithGhc=$GHC]
+[ WithGhc="$withval" ],
+[ 
+  if test "$GHC" = ""; then
+    AC_PATH_PROG(GHC,ghc)
+  fi
+  WithGhc=$GHC
+]
 )
 AC_SUBST(WithGhc)
 
@@ -540,7 +542,7 @@ dnl ** figure out how to do context diffs
 FPTOOLS_PROG_DIFF
 
 dnl ** Find find command (for Win32's benefit)
-AC_PATH_PROG(FindCmd, find)
+FPTOOLS_FIND_FIND
 
 dnl ** look for a decent parser generator (bison preferred)
 dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing 
@@ -971,5 +973,8 @@ FPTOOLS_END_DATA_SECTION
 dnl ** code before data?
 FPTOOLS_CODE_BEFORE_DATA
 
+dnl ** check for ld, and whether ld has -x option
+AC_PATH_PROG(LdCmd, ld)
+FPTOOLS_LD_X
 
 AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )