From: sof <unknown>
Date: Wed, 4 Feb 1998 18:58:34 +0000 (+0000)
Subject: [project @ 1998-02-04 18:58:34 by sof]
X-Git-Tag: Approx_2487_patches~998
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1b24d0cc957bd56d6c2ca1459fc3ea358db53761

[project @ 1998-02-04 18:58:34 by sof]
AC_PROG_GNUCPP: translate backward slashes into forward ones.
AC_HAVE_GCC: tweaked sed regexp to catch cygnus gcc snapshot
version strings (i.e., version cygnus-2.7.2...)
---

diff --git a/aclocal.m4 b/aclocal.m4
index a4b1767..7ca87cc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -244,7 +244,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 ''
@@ -270,7 +270,7 @@ AC_DEFUN(AC_PROG_GNUCPP,
 	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`"
+	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