[project @ 2003-07-24 09:29:10 by simonmar]

[ghc-hetmet.git] / distrib / configure-bin.in

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index bd5882b..ca29d7d 100644 (file)
--- a/distrib/configure-bin.in
+++ b/distrib/configure-bin.in
@@ -24,13 +24,13 @@ TargetPlatform=`/bin/sh $srcdir/config.sub $target` || exit 1
 # We also record the architecture, vendor, and operating system (OS)
 # separately.
 case $TargetPlatform in
-alpha-dec-osf[[12]]*)
+alpha*-dec-osf[[12]]*)
        TargetPlatform=alpha-dec-osf1;;
-alpha-dec-osf[[34]]*)
+alpha*-dec-osf[[345]]*)
        TargetPlatform=alpha-dec-osf3;;
-alpha-unknown-linux)
+alpha*-unknown-linux)
        TargetPlatform=alpha-unknown-linux;;
-alpha-unknown-freebsd*)
+alpha*-unknown-freebsd*)
        TargetPlatform=alpha-unknown-freebsd;;
 hppa1.1-hp-hpux*)
        TargetPlatform=hppa1.1-hp-hpux;;
@@ -48,7 +48,7 @@ i[[3456]]86-*-openbsd*)
        TargetPlatform=i386-unknown-openbsd;;
 i[[3456]]86-*-solaris2*)
        TargetPlatform=i386-unknown-solaris2;;
-i[[3456]]86-*-cygwin32*)
+i[[3456]]86-*-cygwin*)
        exeext='.exe'
        TargetPlatform=i386-unknown-cygwin32;;
 i[[3456]]86-*-mingw32*)
@@ -76,6 +76,8 @@ powerpc-ibm-aix*)
        TargetPlatform=powerpc-ibm-aix;;
 rs6000-ibm-aix*)
        TargetPlatform=rs6000-ibm-aix;;
+powerpc-apple-darwin*)
+       TargetPlatform=powerpc-apple-darwin;;
 sparc-sun-sunos4*)
        TargetPlatform=sparc-sun-sunos4;;
 sparc-sun-solaris2*)
@@ -90,27 +92,16 @@ echo "Which we'll further canonicalise into: $TargetPlatform"
 AC_SUBST(TargetPlatform)
 AC_SUBST(exeext)
 
-AC_CHECK_PROG(PerlCmd,perl,$ac_dir/$ac_word)
-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?"
-    echo ""
-    echo "Continuing, assuming perl will be available as: perl"
-fi
 #
-dnl ** does #!.../perl work? (sometimes it's too long...)
-echo "checking if \`#!$PerlCmd' works in shell scripts"
-echo "#!$PerlCmd"'
-exit $1;
-' > conftest
-chmod u+x conftest
-(SHELL=/bin/sh; export SHELL; ./conftest 69 > /dev/null)
-if test $? -ne 69; then
-   echo "It does!"
-else
-   echo "It doesn't!  Perhaps \`#!$PerlCmd' is too long (often 32 characters max).."
+dnl ** Check Perl installation **
+#
+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
 fi
-rm -f conftest
+FPTOOLS_SHEBANG_PERL
 
 #
 dnl ** figure out how to do a BSD-ish install **