X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure-bin.in;h=2dd90f03e6c4d80d722d1ce79f774bdb476147da;hb=5363a2a46f9d4569ccddd6463fd75fd7c2dd72b0;hp=88579d28b72af7d0fde0335b20fc90411699982a;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index 88579d2..2dd90f0 100644
--- a/distrib/configure-bin.in
+++ b/distrib/configure-bin.in
@@ -4,8 +4,11 @@ dnl
 #!/bin/sh
 #
 
+# Is it there?
 AC_INIT(Makefile.in)
 
+exeext=''
+
 #
 # First off, what system are we running under?
 #
@@ -20,37 +23,59 @@ TargetPlatform=`/bin/sh $srcdir/config.sub $target` || exit 1
 # Suitable names to slam in *_CPP are in platform.h.in.
 # We also record the architecture, vendor, and operating system (OS)
 # separately.
-case $HostPlatform in
-alpha-dec-osf[[1234]]*)
+case $TargetPlatform in
+alpha-dec-osf[[12]]*)
 	TargetPlatform=alpha-dec-osf1;;
+alpha-dec-osf[[34]]*)
+	TargetPlatform=alpha-dec-osf3;;
+alpha-unknown-linux)
+	TargetPlatform=alpha-unknown-linux;;
+alpha-unknown-freebsd*)
+	TargetPlatform=alpha-unknown-freebsd;;
 hppa1.1-hp-hpux*)
 	TargetPlatform=hppa1.1-hp-hpux;;
 i[[3456]]86-*-linuxaout*)
 	TargetPlatform=i386-unknown-linuxaout;;
 i[[3456]]86-*-linux*)
 	TargetPlatform=i386-unknown-linux;;
-i[[3456]]86-*-freebsd*)
+i[[3456]]86-*-freebsd2*)
+	TargetPlatform=i386-unknown-freebsd2;;
+i[[3456]]86-*-freebsd[[3-9]]*)
 	TargetPlatform=i386-unknown-freebsd;;
 i[[3456]]86-*-netbsd*)
 	TargetPlatform=i386-unknown-netbsd;;
+i[[3456]]86-*-openbsd*)
+	TargetPlatform=i386-unknown-openbsd;;
 i[[3456]]86-*-solaris2*)
 	TargetPlatform=i386-unknown-solaris2;;
 i[[3456]]86-*-cygwin32*)
+	exeext='.exe'
 	TargetPlatform=i386-unknown-cygwin32;;
+i[[3456]]86-*-mingw32*)
+	exeext='.exe'
+	# We assume you're using mingw32 via the gcc that comes
+	# with cygwin, and not the native port, so let's augment
+	# the gcc command-line used here with -mno-cygwin to
+	# arrange for good things to happen.
+	CFLAGS="-mno-cygwin $CFLAGS"
+	TargetPlatform=i386-unknown-mingw32
+	;;
 m68k-next-nextstep2)
 	TargetPlatform=m68k-next-nextstep2;;
 m68k-next-nextstep3)
 	TargetPlatform=m68k-next-nextstep3;;
 i[[3456]]86-next-nextstep3)
-	TargetPlatform=i386-next-nextstep3
+	TargetPlatform=i386-next-nextstep3;;
 m68k-sun-sunos4*)
-	TargetPlatform=m68k-sun-sunos4 #hack
+	TargetPlatform=m68k-sun-sunos4;;
 mips-dec-ultrix*)
         TargetPlaformP=mips-dec-ultrix;;
 mips-sgi-irix*)
 	TargetPlatform=mips-sgi-irix;;
 powerpc-ibm-aix*)
 	TargetPlatform=powerpc-ibm-aix;;
+rs6000-ibm-aix*)
+	TargetPlatform=rs6000-ibm-aix;;
 sparc-sun-sunos4*)
 	TargetPlatform=sparc-sun-sunos4;;
 sparc-sun-solaris2*)
@@ -60,41 +85,17 @@ sparc-sun-solaris2*)
         exit 1
         ;;
 esac
-echo "Which we'll canonicalise into: $TargetPlatform"
+echo "Which we'll further canonicalise into: $TargetPlatform"
 
-platform=$TargetPlatform
-AC_SUBST(platform)
+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?"
-    exit 1
-else
-    $PerlCmd -v >conftest.out 2>&1
-    if egrep "version 4" conftest.out >/dev/null 2>&1; then
-        if egrep "Patch level: 35" conftest.out >/dev/null 2>&1; then
-            echo "
-************************************************************************
-Uh-oh...looks like you have Perl 4.035.
-
-Perl version 4.035 has a bug to do with recursion that will bite if
-you run the lit2texi script, when making Info files from
-literate files of various sorts.  Either use the current version
-(4.036), an older version (e.g., perl 4.019) or apply the patch in
-glafp-utils/perl-4.035-fixes to your 4.035 perl.
-************************************************************************
-"
-        fi
-    else
-	if egrep "version 5" conftest.out >/dev/null 2>&1; then
-	    :
-	else
-	    echo "I'm not sure if your version of perl will work,"
-	    echo "but it's worth a shot, eh?"
-	fi
-    fi
-    rm -fr conftest*
+    echo ""
+    echo "Continuing, assuming perl will be available as: perl"
 fi
 #
 dnl ** does #!.../perl work? (sometimes it's too long...)
@@ -107,27 +108,37 @@ chmod u+x conftest
 if test $? -ne 69; then
    echo "It does!"
 else
-   echo "It doesn't!  Perhaps \`#!$PerlCmd' is too long (often 32 characters max)"
-   exit 1
+   echo "It doesn't!  Perhaps \`#!$PerlCmd' is too long (often 32 characters max).."
 fi
 rm -f conftest
-#
-dnl ** check if perl library is properly installed
-# (by seeing if a "do 'getopts.pl'" works...
-if $PerlCmd -e 'do "getopts.pl" || exit(1); exit(0);' > /dev/null 2>&1 ; then
-    :
-else
-    echo "I think your perl library is misinstalled."
-    echo "The following script did not work:"
-    echo '      do "getopts.pl" || exit(1); exit(0);'
-    exit 1
-fi
 
-dnl ** figure out how to do a BSD-ish install
+#
+dnl ** figure out how to do a BSD-ish install **
 #
 AC_PROG_INSTALL
+
 #
+dnl ** how to do symlinks **
+#
+AC_PROG_LN_S()
 
+#
+dnl ** Find the path to sed **
+#
+AC_PATH_PROG(SedCmd,sed)
 
+#
+dnl ** How to invoke cpp directly **
+#
+AC_PROG_CC
+FPTOOLS_HAVE_GCC
+AC_PROG_CPP
+
+#
 AC_OUTPUT(Makefile)
 
+echo "****************************************************"
+echo "Configuration done, ready to either 'make install'"
+echo "or 'make in-place', followed by 'make install-docs'."
+echo "(see README and INSTALL files for more info.)"
+echo "****************************************************"