X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=b727f16a58d81e1738526a598514addbf02e9416;hb=57c3ca2603ef0f2358d8d246bff1dd47ef97e843;hp=8e662fe131474ae870f3961e8ddaff2c1dcf944b;hpb=803963adcff2a811b7ec494e37ab8b2e318bff45;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index 8e662fe..b727f16 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.58 2000/11/02 14:27:01 simonmar Exp $ +dnl $Id: aclocal.m4,v 1.71 2001/04/20 10:56:12 michaelw Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -153,36 +153,65 @@ esac ]) dnl +dnl FPTOOLS_PROG_CHECK_VERSION(VERSIONSTR1, TEST, VERSIONSTR2, +dnl ACTION-IF-TRUE [, ACTION-IF-FALSE]) +dnl +dnl compare versions field-wise (separator is '.') +dnl TEST is one of {-lt,-le,-eq,-ge,-gt} +dnl +dnl quite shell-independant and SUSv2 compliant code +dnl +dnl NOTE: the loop could be unrolled within autoconf, but the +dnl macro code would be a) longer and b) harder to debug... ;) +dnl +AC_DEFUN(FPTOOLS_PROG_CHECK_VERSION, +[if ( IFS="."; + a="[$1]"; b="[$3]"; + while test -n "$a$b" + do + set -- [$]a; h1="[$]1"; shift 2>/dev/null; a="[$]*" + set -- [$]b; h2="[$]1"; shift 2>/dev/null; b="[$]*" + test -n "[$]h1" || h1=0; test -n "[$]h2" || h2=0 + test [$]{h1} -eq [$]{h2} || break + done + test [$]{h1} [$2] [$]{h2} + ) +then ifelse([$4],,[:],[ + $4]) +ifelse([$5],,, +[else + $5]) +fi +])])dnl + + +dnl dnl Check for Happy and version. If we're building GHC, then we need -dnl at least Happy version 1.6. If there's no installed Happy, we look +dnl at least Happy version 1.9. If there's no installed Happy, we look dnl for a happy source tree and point the build system at that instead. dnl -dnl ToDo: when we reset HappyCmd to the source tree, autoconf doesn't -dnl seems to insert it in the cache file. sigh. -dnl AC_DEFUN(FPTOOLS_HAPPY, -[AC_PATH_PROG(HappyCmd,happy) +[ +if test -d $srcdir/happy; then + SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace +fi +AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, -[if test x"$HappyCmd" != x; then - fptools_cv_happy_version="`$HappyCmd -v | changequote(, )dnl - grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ; -elif test -d $srcdir/happy; then - HappyCmd=$hardtop/happy/src/happy-inplace; +[if test x"$HappyCmd" = x"$SrcTreeHappyCmd"; then fptools_cv_happy_version=`grep '^ProjectVersion[ ]*=' $srcdir/happy/mk/version.mk | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; - echo -n "using happy from the source tree... "; +elif test x"$HappyCmd" != x; then + fptools_cv_happy_version="`$HappyCmd -v | + grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ; else fptools_cv_happy_version=""; fi; changequote([, ])dnl -if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then - if test -d $srcdir/ghc; then - echo - echo "Happy version 1.6 or later is required to compile GHC." - exit 1; - fi -fi; ]) +if test -d $srcdir/ghc; then + FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-lt,[1.9], + [AC_MSG_ERROR([Happy version 1.9 or later is required to compile GHC.])])dnl +fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) ]) @@ -369,7 +398,7 @@ ${WithGhc-ghc} --version > conftestghc 2>&1 cat conftestghc >&AC_FD_CC dnl `Useless Use Of cat' award... changequote(<<, >>)dnl - FPTOOLS_CV_GHC_VERSION=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.]\+\).*/\1/p'` + FPTOOLS_CV_GHC_VERSION=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9][0-9.]*\).*/\1/p'` changequote([, ])dnl rm -fr conftest* if test "[$]FPTOOLS_CV_GHC_VERSION" = "" @@ -436,7 +465,7 @@ main() { FILE *f=fopen("conftestval", "w"); if (!f) exit(1); - fprintf(f, "%d\n", offsetof(struct { char c; $1 ty;},ty)); + fprintf(f, "%d", offsetof(struct { char c; $1 ty;},ty)); exit(0); }], AC_CV_NAME=`cat conftestval`, @@ -526,6 +555,46 @@ AC_DEFINE(HAVE_LONG_LONG) fi ]) +dnl ** Obtain the value of a C constant. +dnl The value will be `(-1)' if the constant is undefined. +dnl +dnl This is set up so that the argument can be a shell variable. +dnl +AC_DEFUN(FPTOOLS_CHECK_CCONST, +[ +eval "def_name=CCONST_$1" +eval "cv_name=ac_cv_cconst_$1" +AC_MSG_CHECKING(value of $1) +AC_CACHE_VAL($cv_name, +[AC_TRY_RUN([#include +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", $1); + exit(0); +}], +eval "$cv_name=`cat conftestval`", +eval "$cv_name=-1", +ifelse([$2], , , eval "$cv_name=$2"))])dnl +eval "fptools_check_cconst_result=`echo '$'{$cv_name}`" +AC_MSG_RESULT($fptools_check_cconst_result) +AC_DEFINE_UNQUOTED($def_name, $fptools_check_cconst_result) +unset fptools_check_cconst_result +]) + +dnl ** Invoke AC_CHECK_CCONST on each argument (which have to separate with +dnl spaces) +dnl +AC_DEFUN(FPTOOLS_CHECK_CCONSTS, +[for ac_const_name in $1 +do +FPTOOLS_CHECK_CCONST($ac_const_name)dnl +done +]) + + dnl *** Can we open files in binary mode? *** dnl AC_DEFUN(FPTOOLS_O_BINARY, @@ -820,7 +889,7 @@ dnl The variable LIBM (which is not an output variable by default) is dnl set to a value which is suitable for use in a Makefile (for example, dnl in make's LOADLIBES macro) provided you AC_SUBST it first. dnl -dnl @version 0.01 $Id: aclocal.m4,v 1.58 2000/11/02 14:27:01 simonmar Exp $ +dnl @version 0.01 $Id: aclocal.m4,v 1.71 2001/04/20 10:56:12 michaelw Exp $ dnl @author Matthew D. Langston # FPTOOLS_CHECK_LIBM - check for math library @@ -828,7 +897,7 @@ AC_DEFUN(FPTOOLS_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case "$host" in -*-*-beos* | *-*-cygwin*) +*-*-beos* | *-*-macosx*) # These system don't have libm ;; *-ncr-sysv4.3*) @@ -908,7 +977,7 @@ dnl Please note that as the ac_opengl macro and the toy example evolves, dnl the version number increases, so you may have to adjust the above dnl URL accordingly. dnl -dnl @version 0.01 $Id: aclocal.m4,v 1.58 2000/11/02 14:27:01 simonmar Exp $ +dnl @version 0.01 $Id: aclocal.m4,v 1.71 2001/04/20 10:56:12 michaelw Exp $ dnl @author Matthew D. Langston AC_DEFUN(FPTOOLS_HAVE_OPENGL,