Commit a08aa16a authored by reid's avatar reid

[project @ 2003-05-17 14:49:45 by reid]

Add checks for ghc-pkg and green-card 3.00 (used in x11 lib)
parent 14a46cb9
dnl $Id: aclocal.m4,v 1.115 2003/03/26 12:33:11 simonmar Exp $
dnl $Id: aclocal.m4,v 1.116 2003/05/17 14:49:45 reid Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
......@@ -187,6 +187,28 @@ fi
])])dnl
dnl
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,
changequote(, )dnl
[if test x"$GreencardCmd" != x; then
fptools_cv_greencard_version="`$GreencardCmd --version |
grep 'version' | sed -e 's/green-card. 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
GreencardVersion=$fptools_cv_greencard_version
AC_SUBST(GreencardVersion)
])
dnl
dnl Check for Happy and version. If we're building GHC, then we need
dnl at least Happy version 1.13. If there's no installed Happy, we look
......
......@@ -670,6 +670,19 @@ fi
AC_SUBST(CompressCmd)
AC_SUBST(CompressSuffix)
dnl ** check for ghc-pkg command
AC_PATH_PROG(GhcPkgCmd,ghc-pkg)
AC_ARG_WITH(greencard,
[ --with-greencard=<greencard compiler>
Use a command different from 'green-card' to compile GreenCard files
],
[
GreencardCmd=$withval;
FPTOOLS_GREENCARD(3.00)
]
)
AC_ARG_ENABLE(src-tree-happy,
[ --enable-src-tree-happy
Build and use source tree (fptools/happy) version of happy.
......
......@@ -830,7 +830,6 @@ VERBATIM = $(VERBATIM_PREFIX)verbatim
SGMLVERB = $(SGMLVERB_PREFIX)sgmlverb
RUNTEST = $(RUNTEST_PREFIX)runstdtest
LX = @LxCmd@
GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card
BLD_DLL = dllwrap
......@@ -840,6 +839,17 @@ BLD_DLL = dllwrap
ILX2IL = ilx2il
ILASM = ilasm
#
# ghc-pkg
#
GHC_PKG = @GhcPkgCmd@
#
# Greencard
#
GREENCARD = @GreencardCmd@
GREENCARD_VERSION = @GreencardVersion@
#
# Happy
#
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment