X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=e636a5c8e76863f4003412c1ab885c0cd1f9cfc2;hb=ab661fe04ea005e60c8f5ba223d22e3122dff900;hp=c79cef4c414e134ceb112c3030499ad43c7fbc46;hpb=c820a01d7d25013deaac45331e234bacf775a0ea;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index c79cef4..e636a5c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.42 1999/06/07 10:12:52 simonmar Exp $ +dnl $Id: aclocal.m4,v 1.52 2000/06/30 09:34:09 simonmar Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -73,6 +73,25 @@ fi ]) +dnl *** Does libc contain GNU regex? *** +dnl +AC_DEFUN(FPTOOLS_REGEX_IN_LIBC, +[AC_CACHE_CHECK([for GNU regex in libc], fptools_cv_have_regex, +[AC_TRY_LINK([#if HAVE_UNISTD_H +#include +#endif +#include +],[ struct re_pattern_buffer patbuf; re_compile_pattern("",0,&patbuf); ], +fptools_cv_have_regex=yes, fptools_cv_have_regex=no)]) +if test "$fptools_cv_have_regex" = yes; then + HaveRegex=YES +else + HaveRegex=NO +fi +AC_SUBST(HaveRegex) +]) + + dnl ** check for leading underscores in symbol names dnl dnl Test for determining whether symbol names have a leading @@ -134,26 +153,37 @@ esac ]) dnl -dnl Check for Happy and version. +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 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,,$PATH ${hardtop}/happy/src) +[AC_PATH_PROG(HappyCmd,happy) 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'`" ; -changequote([, ])dnl +elif test -d $srcdir/happy; then + HappyCmd=$hardtop/happy/src/happy-inplace; + 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... "; else fptools_cv_happy_version=""; fi; -if expr "$fptools_cv_happy_version" "<" 1.4 > /dev/null 2>&1; then - echo - echo "Happy version 1.4 or later is required to compile GHC." - exit 1; +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; ]) -HappyVersion=$ac_cv_happy_version; +HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) ]) @@ -303,66 +333,50 @@ HaveGcc=`echo $fptools_cv_have_gcc | sed 'y/yesno/YESNO/'` AC_SUBST(HaveGcc) ]) -dnl -dnl FPTOOLS_PROG_GNUCPP gathers the path to the cpp that the -dnl gcc driver calls upon. -dnl -dnl Substitutes: GNUCPP and RAWCPP (latter is 'GNUCPP -traditional') -dnl -AC_DEFUN(FPTOOLS_PROG_GNUCPP, -[AC_CACHE_CHECK([how to invoke GNU cpp directly], fptools_cv_gnu_cpp, -[if test "$HaveGcc" = "YES"; then - echo > conftest.c - $CC -v -E conftest.c >/dev/null 2>conftest.out - # \x5c = backslash - echo 'tr/\x5c/\//; /(\S+\/)cpp/ && print "[$]{1}cpp -iprefix [$]1";' > conftest.pl - fptools_cv_gnu_cpp="`eval $PerlCmd -n conftest.pl conftest.out`" - rm -fr conftest* - else - # We need to be able to invoke CPP directly, preferably - # with input from stdin (mkdependHS and hscpp depend on - # this at the moment). - # Take a guess at what to use, this probably won't work. - echo Warning: GNU cpp not found, using $CPP - fptools_cv_gnu_cpp = $CPP - fi -]) -GNUCPP=$fptools_cv_gnu_cpp -RAWCPP="$GNUCPP -traditional" -AC_SUBST(GNUCPP) -AC_SUBST(RAWCPP) -]) - dnl Small feature test for perl version. Assumes PerlCmd dnl contains path to perl binary dnl AC_DEFUN(FPTOOLS_CHECK_PERL_VERSION, [$PerlCmd -v >conftest.out 2>&1 -if grep "version 4" conftest.out >/dev/null 2>&1; then - if grep "Patch level: 35" conftest.out >/dev/null 2>&1; then - echo " -************************************************************************ -Uh-oh...looks like you have Perl 4.035. - -Perl version 4.035 has a bug to do with recursion that will bite if -you run the lit2texi script, when making Info files from -literate files of various sorts. Either use perl5, the last version of perl4 -(4.036), or an older version (e.g., perl 4.019). Failing that, don't create -any Info files :-) -************************************************************************ -" - fi +if grep "version 5" conftest.out >/dev/null 2>&1; then + : else - if grep "version 5" conftest.out >/dev/null 2>&1; then + if grep "version 6" conftest.out >/dev/null 2>&1; then : else - echo "I'm not sure if your version of perl will work," - echo "but it's worth a shot, eh?" + echo "Your version of perl probably won't work." fi fi rm -fr conftest* ]) +dnl Test for version of installed ghc. Uses $GHC. Largely pinched from c2hs. +dnl +AC_DEFUN(FPTOOLS_GHC_VERSION, +[ AC_CACHE_CHECK([version of ghc], fptools_cv_ghc_version, [ + fptools_cv_ghc_version=`$GHC --version 2>&1 | sed -e 's/.*\([[0-9]]\)\.\([[0-9]]*\)\([[.-]]\([[0-9]]*\)\)\?.*/\1.\2.\4/'` + ]) + ghc_maj_vers=`echo $fptools_cv_ghc_version | sed -e 's/^\([[0-9]]\).*/\1/'` + ghc_min_vers=`echo $fptools_cv_ghc_version | sed -e 's/^[[0-9]]\.\([[0-9]]*\).*/\1/'` + ghc_patch_level=`echo $fptools_cv_ghc_version | sed -e 's/^[[0-9]]\.[[0-9]]*\.\([[0-9]]*\)/\1/'` + + if test "$ghc_patch_level" = ""; then + GhcVersion=$ghc_maj_vers.$ghc_min_vers + ghc_patch_level="0" + else + GhcVersion=$ghc_maj_vers.$ghc_min_vers.$ghc_patch_level + fi + + GhcMajVersion=$ghc_maj_vers + GhcMinVersion=$ghc_min_vers + GhcPatchLevel=$ghc_patch_level + + AC_SUBST(GhcVersion) + AC_SUBST(GhcMajVersion) + AC_SUBST(GhcMinVersion) + AC_SUBST(GhcPatchLevel) +]) + dnl ** figure out the alignment restriction of a type dnl (required SIZEOF test but AC_CHECK_SIZEOF doesn't call PROVIDE dnl so we can't call REQUIRE) @@ -406,6 +420,53 @@ undefine([AC_CV_NAME])dnl undefine([AC_CV_SIZEOF_NAME])dnl ]) +dnl ** Map an arithmetic C type to a Haskell type. +dnl Based on autconf's AC_CHECK_SIZEOF. + +dnl FPTOOLS_CHECK_HTYPE(TYPE [, DEFAULT_VALUE, [, VALUE-FOR-CROSS-COMPILATION]) +AC_DEFUN(FPTOOLS_CHECK_HTYPE, +[changequote(<<, >>)dnl +dnl The name to #define. +define(<>, translit(htype_$1, [a-z *], [A-Z_P]))dnl +dnl The cache variable name. +define(<>, translit(fptools_cv_htype_$1, [ *], [_p]))dnl +changequote([, ])dnl +AC_MSG_CHECKING(Haskell type for $1) +AC_CACHE_VAL(AC_CV_NAME, +[AC_TRY_RUN([#include +#include +#ifdef HAVE_SIGNAL_H +#include +#endif +#ifdef HAVE_TIME_H +#include +#endif + +typedef $1 testing; + +main() { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + if (((testing)((int)((testing)1.4))) == ((testing)1.4)) { + fprintf(f, "%s%d\n", + ((testing)(-1) < (testing)0) ? "Int" : "Word", + sizeof(testing)*8); + } else { + fprintf(f,"%s\n", + (sizeof(testing) > sizeof(double)) ? "LDouble" : + (sizeof(testing) == sizeof(double)) ? "Double" : "Float"); + } + fclose(f); + exit(0); +}], AC_CV_NAME=`cat conftestval`, +ifelse([$2], , AC_CV_NAME=NotReallyAType, AC_CV_NAME=$2), +ifelse([$3], , AC_CV_NAME=NotReallyATypeCross, AC_CV_NAME=$3))]) dnl +AC_MSG_RESULT($AC_CV_NAME) +AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) +undefine([AC_TYPE_NAME])dnl +undefine([AC_CV_NAME])dnl +]) + dnl ** figure out whether C compiler supports 'long long's dnl (Closely based on Andreas Zeller's macro for testing dnl for this under C++) @@ -624,5 +685,48 @@ AC_DEFINE(HAVE_PROTOTYPES) fi ]) +dnl ** Check which CATALOG file we have to use with DocBook SGML. +dnl +dnl FPTOOLS_DOCBOOK_CATALOG(VARIABLE, JADE, STYLESHEET, CATALOGS-TO-CHECK-FOR) +dnl +dnl If any of the catalogs given in CATALOGS-TO-CHECK-FOR works on this +dnl platform, let VARIABLE refer to this catalog; otherwise, VARIABLE +dnl is set to "no". JADE is the jade executable and STYLESHEET +dnl a DocBook style sheet. +dnl +AC_DEFUN(FPTOOLS_DOCBOOK_CATALOG, +[AC_CACHE_CHECK([for DocBook CATALOG], fptools_cv_sgml_catalog, +[ +cat > conftest.sgml << EOF + +
+ +Test +Test +
Test
+Test + +Test + +Test. + + +
+EOF +fptools_cv_sgml_catalog=no +for fptools_catalog in $4; do + ac_try="$2 -t rtf -d $3#print -c $fptools_catalog conftest.sgml" + if AC_TRY_EVAL(ac_try); then + fptools_cv_sgml_catalog=[$]fptools_catalog + break + fi +done +]) +rm -rf conftest* +if test $fptools_cv_sgml_catalog != "no"; then + $1=$fptools_cv_sgml_catalog +fi +]) + # LocalWords: fi