From: sof <unknown>
Date: Tue, 25 Oct 2005 17:31:38 +0000 (+0000)
Subject: [project @ 2005-10-25 17:31:38 by sof]
X-Git-Tag: Initial_conversion_from_CVS_complete~29
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=aa96eaed38a981da6f95fb9892aed25f478e657c;hp=a9fdb62ed158c777921127e2351bed89e9f06074;p=haskell-directory.git

[project @ 2005-10-25 17:31:38 by sof]
FPTOOLS_CHECK_HTYPE: correctly scope the resetting of CPPFLAGS; as was,
it got blown away if the value was cached.

Merge to STABLE.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 5781626..d03e738 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -145,8 +145,8 @@ main() {
   exit(0);
 }]])],[AC_CV_NAME=`cat conftestval`],
 [ifelse([$2], , [AC_CV_NAME=NotReallyAType; AC_CV_NAME_supported=no], [AC_CV_NAME=$2])],
-[ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], [AC_CV_NAME=$3])])]) dnl
-CPPFLAGS="$fp_check_htype_save_cppflags"
+[ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], [AC_CV_NAME=$3])])
+CPPFLAGS="$fp_check_htype_save_cppflags"]) dnl
 if test "$AC_CV_NAME_supported" = yes; then
   AC_MSG_RESULT($AC_CV_NAME)
   AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1])