[project @ 1998-02-12 12:11:53 by simonm]

revert 'tr' breakage for the time being.

diff --git a/aclocal.m4 b/aclocal.m4
index 3ecbc1f..85667d2 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,4 @@
+# $Id: aclocal.m4,v 1.16 1998/02/12 12:11:53 simonm Exp $
 #
 # Extra autoconf macros for the Glasgow fptools
 #
@@ -113,12 +114,6 @@ if expr "$ac_cv_happy_version" "<" 1.4 > /dev/null 2>&1; then
 fi;
 ])
 HappyVersion=$ac_cv_happy_version;
-if test x"$HappyCmd" != x && expr "$HappyVersion" \<= "1.3" >/dev/null; then
-       echo "   Happy Version 1.3 or later is required to compile GHC."
-       echo "   Using the Happy sources in the tree.";
-       HappyCmd=""
-       AC_SUBST(HappyCmd)
-fi;
 AC_SUBST(HappyVersion)
 ])
 
@@ -279,8 +274,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 'tr/\\/\//; /(\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