[project @ 2000-05-15 22:44:00 by lewie]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index 42415b5..80be29a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -407,15 +407,27 @@ dnl --------------------------------------------------------------
 dnl ** does #! work?
 AC_SYS_INTERPRETER()
 
-dnl ** look for `perl', but watch out for version 4.035
-AC_PATH_PROG(PerlCmd,perl)
-if test -z "$PerlCmd"; then
-   echo "You must install perl before you can continue"
-   echo "Perhaps it is already installed, but not in your PATH?"
-   exit 1
-else
-FPTOOLS_CHECK_PERL_VERSION
-fi
+dnl ** look for `perl', but only in /bin on Windows
+case $HostOS_CPP in
+cygwin32|mingw32)
+   AC_CHECK_PROG(PerlCmd,perl,/bin/perl,,/bin)
+   if test -z "$PerlCmd"; then
+      echo "You must install the version of Perl shipped with GHC"
+      echo "(or a compatible one) in /bin."
+      exit 1
+   fi
+   ;;
+*)
+   AC_PATH_PROG(PerlCmd,perl)
+   if test -z "$PerlCmd"; then
+      echo "You must install perl before you can continue"
+      echo "Perhaps it is already installed, but not in your PATH?"
+      exit 1
+   else
+   FPTOOLS_CHECK_PERL_VERSION
+   fi
+   ;;
+esac
 
 dnl ** does #! path/to/perl work? (sometimes it's too long...)
 FPTOOLS_SHEBANG_PERL
@@ -476,6 +488,9 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 dnl ** check for gzip/compress
 AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
 
+dnl ** check for jade/openjade
+AC_PATH_PROGS(JadeCmd,openjade jade,jade)
+
 compress_nm=`basename $CompressCmd`
 if test x"$compress_nm" = xgzip; then
   CompressCmd="$CompressCmd -d"