X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=51da0dfff122d15268073a1df59fadabcd28d7e9;hb=4b7199131876dc3af72612a84348b0c03c7849a5;hp=af28baab8b5e11c79bda43d775d9a9fd7944eb8a;hpb=38f89fbe99659e6d63937b37bd87a3edd8aba687;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index af28baa..51da0df 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.26 1998/08/16 16:25:21 sof Exp $ +dnl $Id: aclocal.m4,v 1.50 2000/06/15 20:22:53 panne Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -7,6 +7,28 @@ dnl prefixed with FPTOOLS_ to ensure we don't clash dnl with any pre-supplied autoconf ones. dnl +dnl Is timezone around? (in a header file) +dnl +AC_DEFUN(FPTOOLS_HAVE_TIMEZONE, +[AC_CACHE_CHECK([timezone], fptools_cv_have_timezone, +[AC_TRY_COMPILE([#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +], [return timezone;], +fptools_cv_have_timezone=yes, fptools_cv_have_timezone=no)]) +if test "$fptools_cv_have_timezone" = yes; then + AC_DEFINE(HAVE_TIMEZONE) +fi +]) + +dnl dnl Has timezone the type time_t or long (HP-UX 10.20 apparently dnl has `long'..) dnl @@ -23,7 +45,7 @@ AC_DEFUN(FPTOOLS_TYPE_TIMEZONE, # endif #endif -extern time_t timezone; +extern time_t timezone; ], [int i;], fptools_cv_type_timezone=time_t, fptools_cv_type_timezone=long)]) AC_DEFINE_UNQUOTED(TYPE_TIMEZONE, $fptools_cv_type_timezone) @@ -50,6 +72,7 @@ if test "$fptools_cv_altzone" = yes; then fi ]) + dnl ** check for leading underscores in symbol names dnl dnl Test for determining whether symbol names have a leading @@ -57,6 +80,11 @@ dnl underscore. dnl dnl We assume that they _haven't_ if anything goes wrong. dnl +dnl Some nlist implementations seem to try to be compatible by ignoring +dnl a leading underscore sometimes (eg. FreeBSD). We therefore have +dnl to work around this by checking for *no* leading underscore first. +dnl Sigh. --SDM +dnl AC_DEFUN(FPTOOLS_UNDERSCORE, [AC_CHECK_LIB(elf, nlist, LIBS="-lelf $LIBS")dnl AC_CACHE_CHECK([leading underscore in symbol names], fptools_cv_lead_uscore, @@ -65,17 +93,22 @@ dnl dnl Hack!: nlist() under Digital UNIX insist on there being an _, dnl but symbol table listings shows none. What is going on here?!? dnl +dnl Another hack: cygwin doesn't come with nlist.h , so we hardwire +dnl the underscoredness of that "platform" changequote(<<, >>)dnl << case $HostPlatform in alpha-dec-osf*) fptools_cv_lead_uscore='no';; +*cygwin32) fptools_cv_lead_uscore='yes';; +*mingw32) fptools_cv_lead_uscore='yes';; *) >> changequote([, ])dnl AC_TRY_RUN([#ifdef HAVE_NLIST_H #include changequote(<<, >>)dnl << -struct nlist xYzzY[] = {{"_xYzzY", 0},{0}}; +struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}}; +struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}}; #endif main(argc, argv) @@ -83,7 +116,9 @@ int argc; char **argv; { #ifdef HAVE_NLIST_H - if(nlist(argv[0], xYzzY) == 0 && xYzzY[0].n_value != 0) + if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0) + exit(1); + if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0) exit(0);>> changequote([, ])dnl #endif @@ -99,7 +134,12 @@ 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) @@ -108,17 +148,23 @@ AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, 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) ]) @@ -268,61 +314,18 @@ 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 - gcc -v -E conftest.c >/dev/null 2>conftest.out - # \x5c = backslash - echo 'tr/\x5c/\//; /(\S+\/cpp)/ && print "[$]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* @@ -371,6 +374,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++) @@ -407,8 +457,11 @@ AC_CACHE_VAL(fptools_cv_have_o_binary, [ AC_LANG_SAVE AC_LANG_C -AC_TRY_COMPILE(,[#include -x = O_BINARY;], +AC_TRY_COMPILE(, +[#ifdef HAVE_FCNTL_H +#include +#endif +int x = O_BINARY;], fptools_cv_have_o_binary=yes, fptools_cv_have_o_binary=no) AC_LANG_RESTORE @@ -418,3 +471,216 @@ if test "$fptools_cv_have_o_binary" = yes; then AC_DEFINE(HAVE_O_BINARY) fi ]) + +dnl *** Which one comes first, .text or .data? *** +dnl +AC_DEFUN(FPTOOLS_CODE_BEFORE_DATA, +[AC_CACHE_CHECK([if code section appears before data], fptools_cv_code_bef_data, +[AC_TRY_RUN([ +int f() { return 1; } +int i; +int main() { return ((char*)&f > (char*)&i); } + +], +fptools_cv_code_bef_data=yes, fptools_cv_code_bef_data=no,false)]) +if test "$fptools_cv_code_bef_data" = yes; then + AC_DEFINE(CODE_BEFORE_DATA) +fi +]) + +dnl *** Helper function ** +dnl +AC_DEFUN(FPTOOLS_IN_SCOPE,AC_TRY_LINK([extern char* $1;],[return (int)&$2], $3=yes, $3=no)) + +dnl *** What's the end-of-text-section marker called? *** +dnl +AC_DEFUN(FPTOOLS_END_TEXT_SECTION, +[AC_MSG_CHECKING([for end of text section marker]) +not_done=1 +for i in data_start _data_start etext _etext __etext; do + FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_text) + if test "$fptools_end_of_text" = yes; then + AC_CACHE_VAL([fptools_cv_end_of_text_decl], AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER_DECL, $i)) + AC_CACHE_VAL([fptools_cv_end_of_text], AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER, $i)) + not_done=0 + break + fi +done +if test "$not_done" = 1; then +FPTOOLS_IN_SCOPE(etext asm("etext"),etext,fptools_end_of_text); +if test "$fptools_end_of_text" = yes; then + AC_CACHE_VAL([fptools_cv_end_of_text], AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER, etext)) + AC_CACHE_VAL([fptools_cv_end_of_text_decl], AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER_DECL, etext asm("etext"))) +else + AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER_DECL, dunno_what_it_is) + AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER, dunno_what_it_is) +fi +fi +AC_MSG_RESULT([$]fptools_cv_end_of_text) +]) + +dnl *** What's the end-of-data-section marker called? *** +dnl +AC_DEFUN(FPTOOLS_END_DATA_SECTION, +[AC_MSG_CHECKING([for end of data section marker]) +not_done=1 +for i in end _end __end; do + FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_data) + if test "$fptools_end_of_data" = yes; then + AC_CACHE_VAL([fptools_cv_end_of_data_decl], [AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER_DECL, $i)]) + AC_CACHE_VAL([fptools_cv_end_of_data], [AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER, $i)]) + not_done=0 + break + fi +done +if test "$not_done" = 1; then +FPTOOLS_IN_SCOPE(end asm("end"),end,fptools_end_of_data); +if test "$fptools_end_of_data" = yes; then + AC_CACHE_VAL([fptools_cv_end_of_data_decl], [AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER_DECL, end asm("end"))]) + AC_CACHE_VAL([fptools_cv_end_of_data], [AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER, end)]) +else + AC_CACHE_VAL([fptools_cv_end_of_data_decl], [AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER_DECL, dunno_what_it_is)]) + AC_CACHE_VAL([fptools_cv_end_of_data], [AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER, dunno_what_it_is)]) +fi +fi +AC_MSG_RESULT([$]fptools_cv_end_of_data) +]) + + + +dnl Based on AC_TRY_LINK - run iftrue if links cleanly with no warning + +dnl FPTOOLS_TRY_LINK_NOWARN(flags,main?,iftrue,iffalse) + +AC_DEFUN(FPTOOLS_TRY_LINK_NOWARN, +[ +ac_save_LIBS="$LIBS" +LIBS=[$1]; +cat > conftest.$ac_ext < 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