X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=ab0ba4322f0737ae8135657a75b5d2d1b21b00d4;hp=765647e1ea24bb777d9dfa7818501fcbd7085778;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=422eaf986e456ed0e16647445f7bdcb3018eb6c2 diff --git a/aclocal.m4 b/aclocal.m4 index 765647e..ab0ba43 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -75,27 +75,6 @@ AC_SUBST(ContextDiffCmd, [$fp_cv_context_diff]) ])# FP_PROG_CONTEXT_DIFF -# FP_DECL_ALTZONE -# --------------- -# Defines HAVE_DECL_ALTZONE to 1 if declared, 0 otherwise. -# -# Used by base package. -AC_DEFUN([FP_DECL_ALTZONE], -[AC_REQUIRE([AC_HEADER_TIME])dnl -AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_DECLS([altzone], [], [],[#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif]) -])# FP_DECL_ALTZONE - - # FP_COMPUTE_INT(EXPRESSION, VARIABLE, INCLUDES, IF-FAILS) # -------------------------------------------------------- # Assign VARIABLE the value of the compile-time EXPRESSION using INCLUDES for @@ -245,26 +224,10 @@ dnl at least Happy version 1.14. If there's no installed Happy, we look dnl for a happy source tree and point the build system at that instead. dnl AC_DEFUN([FPTOOLS_HAPPY], -[ -if test -d $srcdir/happy; then - SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace -else - SrcTreeHappyCmd="" -fi -if test x"$UseSrcTreeHappy" = xYES; then - if test x"$SrcTreeHappyCmd" != x; then - HappyCmd=$SrcTreeHappyCmd - else - AC_MSG_ERROR([--enable-src-tree-happy given, but happy not found in source tree]) - fi -else - AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd) -fi +[AC_PATH_PROG(HappyCmd,happy,) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl -[if test x"$HappyCmd" = x"$SrcTreeHappyCmd" -a -e $srcdir/happy/mk/version.mk; then - fptools_cv_happy_version=`grep '^ProjectVersion[ ]*=' $srcdir/happy/mk/version.mk | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; -elif test x"$HappyCmd" != x; then +[if test x"$HappyCmd" != x; then fptools_cv_happy_version="`$HappyCmd -v | grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ; else @@ -272,9 +235,10 @@ else fi; changequote([, ])dnl ]) -if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15], - [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]dnl +if test ! -f compiler/parser/Parser.hs || test ! -f compiler/main/ParsePkgConf.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs +then + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15], + [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]dnl fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) @@ -285,21 +249,7 @@ dnl Check for Haddock and version. If there's no installed Haddock, we look dnl for a haddock source tree and point the build system at that instead. dnl AC_DEFUN([FPTOOLS_HADDOCK], -[ -if test -d $srcdir/haddock; then - SrcTreeHaddockCmd=$hardtop/haddock/src/haddock-inplace -else - SrcTreeHaddockCmd="" -fi -if test x"$UseSrcTreeHaddock" = xYES; then - if test x"$SrcTreeHaddockCmd" != x; then - HaddockCmd=$SrcTreeHaddockCmd - else - AC_MSG_ERROR([--enable-src-tree-haddock given, but haddock not found in source tree]) - fi -else - AC_PATH_PROG(HaddockCmd,haddock,$SrcTreeHaddockCmd) -fi +[AC_PATH_PROG(HaddockCmd,haddock,) dnl Darn, I forgot to make Haddock print out its version number when dnl invoked with -v. We could try generating some HTML and grepping dnl through that to find the version number, but I think we'll make @@ -308,30 +258,14 @@ dnl do without it for now. dnl dnl Check for Alex and version. If we're building GHC, then we need -dnl at least Alex version 2.0. If there's no installed Alex, we look -dnl for a alex source tree and point the build system at that instead. +dnl at least Alex version 2.0.1. dnl AC_DEFUN([FPTOOLS_ALEX], [ -if test -d $srcdir/alex; then - SrcTreeAlexCmd=$hardtop/alex/src/alex-inplace -else - SrcTreeAlexCmd="" -fi -if test x"$UseSrcTreeAlex" = xYES; then - if test x"$SrcTreeAlexCmd" != x; then - AlexCmd=$SrcTreeAlexCmd - else - AC_MSG_ERROR([--enable-src-tree-alex given, but alex not found in source tree]) - fi -else - AC_PATH_PROG(AlexCmd,alex,$SrcTreeAlexCmd) -fi +AC_PATH_PROG(AlexCmd,alex,) AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version, changequote(, )dnl -[if test x"$AlexCmd" = x"$SrcTreeAlexCmd"; then - fptools_cv_alex_version=`grep '^ProjectVersion[ ]*=' $srcdir/alex/mk/version.mk | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; -elif test x"$AlexCmd" != x; then +[if test x"$AlexCmd" != x; then fptools_cv_alex_version="`$AlexCmd -v | grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'`" ; else @@ -339,9 +273,10 @@ else fi; changequote([, ])dnl ]) -if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Lexer.hs; then - FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0], - [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])[]dnl +if test ! -f compiler/cmm/CmmLex.hs || test ! -f compiler/parser/Lexer.hs +then + FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0.1], + [AC_MSG_ERROR([Alex version 2.0.1 or later is required to compile GHC.])])[]dnl fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) @@ -732,116 +667,6 @@ ifelse($#, [1], [dnl ])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 -define(<>, translit(fptools_cv_htype_sup_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(Haskell type for $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_CV_NAME_supported=yes -fp_check_htype_save_cppflags="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include - -#if HAVE_SYS_TYPES_H -# include -#endif - -#if HAVE_UNISTD_H -# include -#endif - -#if HAVE_SYS_STAT_H -# include -#endif - -#if HAVE_FCNTL_H -# include -#endif - -#if HAVE_SIGNAL_H -# include -#endif - -#if HAVE_TIME_H -# include -#endif - -#if HAVE_TERMIOS_H -# include -#endif - -#if HAVE_STRING_H -# include -#endif - -#if HAVE_CTYPE_H -# include -#endif - -#if defined(HAVE_GL_GL_H) -# include -#elif defined(HAVE_OPENGL_GL_H) -# include -#endif - -#if defined(HAVE_AL_AL_H) -# include -#elif defined(HAVE_OPENAL_AL_H) -# include -#endif - -#if defined(HAVE_AL_ALC_H) -# include -#elif defined(HAVE_OPENAL_ALC_H) -# include -#endif - -#if HAVE_SYS_RESOURCE_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_supported=no], [AC_CV_NAME=$2])], -[ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], [AC_CV_NAME=$3])]) -CPPFLAGS="$fp_check_htype_save_cppflags"]) dnl -if test "$AC_CV_NAME_supported" = yes; then - AC_MSG_RESULT($AC_CV_NAME) - AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1]) -else - AC_MSG_RESULT([not supported]) -fi -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -undefine([AC_CV_NAME_supported])dnl -]) - - # FP_CHECK_FUNC(FUNCTION, PROLOGUE, BODY, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------------- # A variant of AC_CHECK_FUNCS, limited to a single FUNCTION, but with the @@ -1079,18 +904,30 @@ AC_SUBST([GhcHasReadline], [`echo $fp_cv_ghc_has_readline | sed 'y/yesno/YESNO/' AC_DEFUN([FP_GCC_NEEDS_NO_OMIT_LFPTR], [AC_REQUIRE([FP_HAVE_GCC]) AC_CACHE_CHECK([whether gcc needs -mno-omit-leaf-frame-pointer], [fp_cv_gcc_needs_no_omit_lfptr], -[FP_COMPARE_VERSIONS([$gcc_version_str], [-ge], [3.2], +[FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.2], [fp_cv_gcc_needs_no_omit_lfptr=yes], [fp_cv_gcc_needs_no_omit_lfptr=no])]) if test "$fp_cv_gcc_needs_no_omit_lfptr" = "yes"; then AC_DEFINE([HAVE_GCC_MNO_OMIT_LFPTR], [1], [Define to 1 if gcc supports -mno-omit-leaf-frame-pointer.]) fi])# FP_GCC_NEEDS_NO_OMIT_LFPTR +# FP_GCC_HAS_NO_UNIT_AT_A_TIME +# -------------------------- +AC_DEFUN([FP_GCC_HAS_NO_UNIT_AT_A_TIME], +[AC_REQUIRE([FP_HAVE_GCC]) +AC_CACHE_CHECK([whether gcc has -fno-unit-at-a-time], [fp_cv_gcc_has_no_unit_at_a_time], +[FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.4], + [fp_cv_gcc_has_no_unit_at_a_time=yes], + [fp_cv_gcc_has_no_unit_at_a_time=no])]) +if test "$fp_cv_gcc_has_no_unit_at_a_time" = "yes"; then + AC_DEFINE([HAVE_GCC_HAS_NO_UNIT_AT_A_TIME], [1], [Define to 1 if gcc supports -fno-unit-at-a-time.]) +fi]) # FP_SETUP_PROJECT_VERSION # --------------------- AC_DEFUN([FP_SETUP_PROJECT_VERSION], [# Some renamings +AC_SUBST([ProjectName], [$PACKAGE_NAME]) AC_SUBST([ProjectVersion], [$PACKAGE_VERSION]) # Split PACKAGE_VERSION into (possibly empty) parts