[project @ 2001-06-30 00:00:49 by sof]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 46b5550..aa8856a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.75 2001/06/26 23:12:19 sof Exp $
+dnl $Id: aclocal.m4,v 1.77 2001/06/30 00:00:49 sof Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -197,9 +197,7 @@ AC_DEFUN(FPTOOLS_HAPPY,
 if test -d $srcdir/happy; then
    SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
 fi
-#AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
-HappyCmd=$SrcTreeHappyCmd
-AC_SUBST(HappyCmd)
+AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 changequote(, )dnl
 [if test x"$HappyCmd" = x"$SrcTreeHappyCmd"; then
@@ -1068,19 +1066,20 @@ fi
 ])
 
 dnl
-dnl Check to see whether CC (gcc) supports the -mwin32 option.
+dnl Check to see whether CC (gcc) supports a particular option.
 dnl 
-AC_DEFUN(FPTOOLS_CC_MWIN32,
-[AC_CACHE_CHECK([whether $CC accepts -mwin32], ac_cv_cc_supports_mwin32,
+AC_DEFUN(FPTOOLS_CC_FLAG,
 [save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -mwin32"
+AC_CACHE_CHECK([whether $CC accepts $1], [ac_cv_cc_$2],
+[CFLAGS="$CFLAGS $1"
  AC_LANG_C
- AC_TRY_COMPILE(,[int main(){return(0);}], ac_cv_cc_supports_mwin32=yes, ac_cv_cc_supports_mwin32=no)
- CFLAGS="$CFLAGS_save"])
-if test "$ac_cv_cc_supports_mwin32" = yes; then
-  CC_MWIN32_FLAG="-mwin32";
+ AC_TRY_COMPILE(,[int main(){return(0);}],
+                 [ac_cv_cc_$2=yes],
+                [ac_cv_cc_$2=no])
+])
+if test "$ac_cv_cc_$2"x = "yesx"; then
+  $2=$extra_flag;
 else
-  CC_MWIN32_FLAG="";
+  $2=$extra_flag;
 fi;
-AC_SUBST(CC_MWIN32_FLAG)
 ])