X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=6a1498b56ef43683834cfb161f8c473ec55caf9d;hb=9e6162f9d0102d1f5738bf78258b24ea5a647ea4;hp=cc7cdab33269a85b3a74e68ac8d104128e63227b;hpb=eb1309d235adf5a65f90803d6291096c93cb7f02;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index cc7cdab..6a1498b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.117 2003/05/23 16:36:58 panne Exp $ +dnl $Id: aclocal.m4,v 1.119 2003/06/05 14:05:36 reid Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -192,19 +192,19 @@ dnl Check for Greencard and version. dnl AC_DEFUN(FPTOOLS_GREENCARD, [ -AC_PATH_PROG(GreencardCmd,green-card) -AC_CACHE_CHECK([for version of green-card], fptools_cv_greencard_version, +AC_PATH_PROG(GreencardCmd,greencard) +AC_CACHE_CHECK([for version of greencard], fptools_cv_greencard_version, changequote(, )dnl [if test x"$GreencardCmd" != x; then fptools_cv_greencard_version="`$GreencardCmd --version | - grep 'version' | sed -e 's/green-card. version \([^ ]*\).*/\1/g'`" + grep 'version' | sed -e 's/greencard. version \([^ ]*\).*/\1/g'`" else fptools_cv_greencard_version="" fi changequote([, ])dnl ]) FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_greencard_version],-lt,$1, - [AC_MSG_ERROR([green-card version $1 or later is required (found '$fptools_cv_greencard_version')])])dnl + [AC_MSG_ERROR([greencard version $1 or later is required (found '$fptools_cv_greencard_version')])])dnl GreencardVersion=$fptools_cv_greencard_version AC_SUBST(GreencardVersion) ]) @@ -795,11 +795,11 @@ AC_CACHE_VAL(fptools_cv_have_o_binary, [ AC_LANG_SAVE AC_LANG_C -AC_TRY_COMPILE(, +AC_TRY_COMPILE( [#ifdef HAVE_FCNTL_H #include -#endif -int x = O_BINARY;], +#endif], +[int x = O_BINARY;], fptools_cv_have_o_binary=yes, fptools_cv_have_o_binary=no) AC_LANG_RESTORE