X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=c79cef4c414e134ceb112c3030499ad43c7fbc46;hb=a2769f3103f938c5e15377de0e098c0c24fe15c5;hp=f2f8006856fcac6e9c8850f1c8c6d11a92d5f9a7;hpb=975addea327843ab15a3fbe10862a810a153150f;p=ghc-hetmet.git diff --git a/aclocal.m4 b/aclocal.m4 index f2f8006..c79cef4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.34 1998/11/24 21:28:00 reid Exp $ +dnl $Id: aclocal.m4,v 1.42 1999/06/07 10:12:52 simonmar 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) @@ -77,7 +99,8 @@ changequote(<<, >>)dnl << case $HostPlatform in alpha-dec-osf*) fptools_cv_lead_uscore='no';; -*cygwin32) fptools_cv_lead_uscore='yes';; +*cygwin32) fptools_cv_lead_uscore='yes';; +*mingw32) fptools_cv_lead_uscore='yes';; *) >> changequote([, ])dnl AC_TRY_RUN([#ifdef HAVE_NLIST_H @@ -114,7 +137,7 @@ dnl dnl Check for Happy and version. dnl AC_DEFUN(FPTOOLS_HAPPY, -[AC_PATH_PROG(HappyCmd,happy) +[AC_PATH_PROG(HappyCmd,happy,,$PATH ${hardtop}/happy/src) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, [if test x"$HappyCmd" != x; then fptools_cv_happy_version="`$HappyCmd -v | @@ -290,7 +313,7 @@ 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 + $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`" @@ -457,55 +480,56 @@ AC_DEFUN(FPTOOLS_IN_SCOPE,AC_TRY_LINK([extern char* $1;],[return (int)&$2], $3=y dnl *** What's the end-of-text-section marker called? *** dnl AC_DEFUN(FPTOOLS_END_TEXT_SECTION, -[AC_CACHE_CHECK([for end of text section marker], fptools_cv_end_of_text, -[ +[AC_MSG_CHECKING([for end of text section marker]) not_done=1 -for i in etext _etext __etext; do - FPTOOLS_IN_SCOPE($i,$i,fptools_cv_end_of_text) - if test "$fptools_cv_end_of_text" = yes; then - AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER_DECL, $i) - AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER, $i) +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_cv_end_of_text) -if test "$fptools_cv_end_of_text" = yes; then - AC_DEFINE(TEXT_SECTION_END_MARKER_DECL, etext asm("etext")) - AC_DEFINE(TEXT_SECTION_END_MARKER, etext) +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(TEXT_SECTION_END_MARKER, dunno_what_it_is) + 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_CACHE_CHECK([for end of data section marker], fptools_cv_end_of_data, -[ +[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_cv_end_of_data) - if test "$fptools_cv_end_of_data" = yes; then - AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER_DECL, $i) - AC_DEFINE_UNQUOTED(DATA_SECTION_END_MARKER, $i) + 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_cv_end_of_data) -if test "$fptools_cv_end_of_data" = yes; then - AC_DEFINE(DATA_SECTION_END_MARKER_DECL, end asm("end")) - AC_DEFINE(DATA_SECTION_END_MARKER, end) +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_DEFINE(DATA_SECTION_END_MARKER_DECL, dunno_what_it_is) - AC_DEFINE(DATA_SECTION_END_MARKER, dunno_what_it_is) + 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) +])