X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=aclocal.m4;h=de6b4215fa25426ba513f866ea3bb870bfd81171;hb=23c94851fb2c98d345d913d35a5a12bbc3a346bd;hp=91b1fc662c5dae9825b40a22ce7fc69599c69c2b;hpb=6e2d3a705fa04245e7b5385e34253b24dc75382e;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 91b1fc6..de6b421 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -62,9 +62,12 @@ AC_CACHE_CHECK([leading underscore in symbol names], ac_cv_lead_uscore,
 # Hack!: nlist() under Digital UNIX insist on there being an _,
 # but symbol table listings show none. What is going on here?!?
 #
-if test $HostPlatform = "alpha-dec-osf1"; then
-   ac_cv_lead_uscore='no'
-else
+changequote(<<, >>)dnl
+<<
+case $HostPlatform in
+alpha-dec-osf*) ac_cv_lead_uscore='no';;
+*) >>
+changequote([, ])dnl
 AC_TRY_RUN([#ifdef HAVE_NLIST_H
 #include <nlist.h>
 changequote(<<, >>)dnl
@@ -83,7 +86,8 @@ changequote([, ])dnl
 #endif
     exit(1);
 }], ac_cv_lead_uscore=yes, ac_cv_lead_uscore=no, ac_cv_lead_uscore=NO)
-fi);
+;;
+esac);
 LeadingUnderscore=`echo $ac_cv_lead_uscore | sed 'y/yesno/YESNO/'`
 AC_SUBST(LeadingUnderscore)
 ])
@@ -102,6 +106,11 @@ changequote([, ])dnl
 else
    ac_cv_happy_version="";
 fi;
+if expr "$ac_cv_happy_version" "<" 1.4 > /dev/null 2>&1; then
+   echo
+   echo "Happy version 1.4 or later is required to compile GHC."
+   exit 1;
+fi;
 ])
 HappyVersion=$ac_cv_happy_version;
 AC_SUBST(HappyVersion)
@@ -239,7 +248,7 @@ AC_DEFUN(AC_HAVE_GCC,
     ac_cv_have_gcc='no'
 else
 changequote(, )dnl
-    cmd_string="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/expr 20 \\\< \1 \\\* 10 + \2/g' `"
+    cmd_string="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/expr 20 \\\< \1 \\\* 10 + \2/g' `"
 changequote([, ])dnl
     if test `eval $cmd_string 2>/dev/null` != "1"; then
 	echo ''
@@ -264,8 +273,8 @@ AC_DEFUN(AC_PROG_GNUCPP,
 [if test "$HaveGcc" = "YES"; then
 	echo > conftest.c
 	gcc -v -E conftest.c >/dev/null 2>conftest.out
-	echo '/(\S+(\/|\\\\)cpp)/ && print "[$]1";' > conftest.pl
-	ac_cv_gnu_cpp="`eval $PerlCmd -n conftest.pl conftest.out`"
+	echo '/(\S+(\/|\\)cpp)/ && print "[$]1";' > conftest.pl
+	ac_cv_gnu_cpp="`eval $PerlCmd -n conftest.pl conftest.out | tr '\\\' / `"
 	rm -fr conftest*
  else
 	# We need to be able to invoke CPP directly, preferably