X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=423393c3531b8827eca77663ec98fedca2a85530;hp=f5485cc5a2773bbca4190a8ef830f7c805ce01d0;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hpb=146687a53f860d1fa56b51e54cc11c56d308f4be diff --git a/aclocal.m4 b/aclocal.m4 index f5485cc..423393c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.93 2002/01/17 09:52:18 sof Exp $ +dnl $Id: aclocal.m4,v 1.108 2002/12/04 23:41:15 dons Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -86,11 +86,11 @@ AC_DEFUN(FPTOOLS_REGEX_IN_LIBC, re_search_2 (&patbuf, "", 0, "",0, 0,0,0,0); ], fptools_cv_have_regex=yes, fptools_cv_have_regex=no)]) if test "$fptools_cv_have_regex" = yes; then - HaveRegex=YES + HaveGNURegex=YES else - HaveRegex=NO + HaveGNURegex=NO fi -AC_SUBST(HaveRegex) +AC_SUBST(HaveGNURegex) ]) @@ -189,7 +189,7 @@ fi dnl dnl Check for Happy and version. If we're building GHC, then we need -dnl at least Happy version 1.9. If there's no installed Happy, we look +dnl at least Happy version 1.13. 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, @@ -214,21 +214,32 @@ else fi; changequote([, ])dnl ]) -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 +if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then + FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-lt,[1.13], + [AC_MSG_ERROR([Happy version 1.13 or later is required to compile GHC.])])dnl fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) +]) -# 1.9 and later is required, assume that we can use -# the "-agc" options. -HappyOpts="-agc" - -FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-gt,[1.11], - [HappyOpts=-agcs]) - -AC_SUBST(HappyOpts) +dnl +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 +fi +if test x"$UseSrcTreeHaddock" = xYES; then + HaddockCmd=$SrcTreeHaddockCmd +else + AC_PATH_PROG(HaddockCmd,haddock,$SrcTreeHaddockCmd) +fi +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 +dnl do without it for now. ]) dnl @@ -407,7 +418,6 @@ AC_DEFUN(FPTOOLS_HAVE_GCC, else changequote(, )dnl is_gcc_v1="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/expr 2000 \\\>= \1 \\\* 1000 + \2/g' `" - is_gcc_v3="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/expr 3000 \\\<= \1 \\\* 1000 + \2/g' `" changequote([, ])dnl fptools_cv_have_gcc='yes' if test `eval $is_gcc_v1 2>/dev/null` = "1"; then @@ -419,15 +429,6 @@ changequote([, ])dnl echo "we recommend 2.95.3, although versions back to 2.7.2 should be ok." AC_MSG_ERROR([gcc 1.X has never been supported]) fi - if test `eval $is_gcc_v3 2>/dev/null` = "1"; then - fptools_cv_have_gcc='no' - echo "" - echo "your gcc version appears to be ..." - $CC --version - echo "gcc versions 3.0 and above are not yet supported." - echo "we recommend 2.95.3, although versions back to 2.7.2 should be ok." - AC_MSG_ERROR([gcc 3.0 and above is not currently supported]) - fi fi ]) HaveGcc=`echo $fptools_cv_have_gcc | sed 'y/yesno/YESNO/'` @@ -442,15 +443,19 @@ AC_DEFUN(FPTOOLS_CHECK_PERL_VERSION, if grep "version 5" conftest.out >/dev/null 2>&1; then : else - if grep "v5.6" conftest.out >/dev/null 2>&1; then - : - else - if grep "version 6" conftest.out >/dev/null 2>&1; then - : - else - echo "Your version of perl probably won't work." - fi - fi + if grep "v5.6" conftest.out >/dev/null 2>&1; then + : + else + if grep "v5.8" conftest.out >/dev/null 2>&1; then + : + else + if grep "version 6" conftest.out >/dev/null 2>&1; then + : + else + echo "Your version of perl probably won't work." + fi + fi + fi fi rm -fr conftest* ]) @@ -501,7 +506,7 @@ dnl [original version pinched from c2hs] dnl AC_DEFUN(FPTOOLS_GHC_VERSION, [FPTOOLS_NOCACHE_CHECK([version of ghc], [fptools_version_of_ghc], -[${WithGhc-ghc} --version > conftestghc 2>&1 +["${WithGhc-ghc}" --version > conftestghc 2>&1 cat conftestghc >&AC_FD_CC #Useless Use Of cat award... fptools_version_of_ghc=`cat conftestghc | sed -n -e 's/, patchlevel *\([[0-9]]\)/.\1/;s/.* version \([[0-9]][[0-9.]]*\).*/\1/p'` @@ -1001,13 +1006,18 @@ 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 +if test -z "$SGML_CATALOG_FILES" ; then + 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 +else +# If the env var SGML_CATALOG_FILES is defined, assume things are cool. + fptools_cv_sgml_catalog="yes" +fi ]) rm -rf conftest* if test $fptools_cv_sgml_catalog != "no"; then @@ -1175,7 +1185,7 @@ dnl AC_HELP_STRING([--with-Mesa], dnl [Prefer the Mesa library over a vendors native OpenGL library (default=yes)], dnl with_Mesa_help_string) dnl AC_ARG_ENABLE(Mesa, $with_Mesa_help_string, use_Mesa=$enableval, use_Mesa=yes) - AC_ARG_ENABLE(Mesa, [ --with-Mesa Prefer the Mesa library over a vendors native OpenGL library (default=yes)], use_Mesa=$enableval, use_Mesa=yes) + AC_ARG_ENABLE(Mesa, [ --with-Mesa Prefer the Mesa library over a vendors native OpenGL library (default=no)], use_Mesa=$enableval, use_Mesa=no) if test x"$use_Mesa" = xyes; then GL_search_list="MesaGL GL opengl32" @@ -1191,7 +1201,7 @@ dnl AC_ARG_ENABLE(Mesa, $with_Mesa_help_string, use_Mesa=$enableval, use_Mesa AC_LANG_C dnl If we are running under X11 then add in the appropriate libraries. - if ! test x"$no_x" = xyes; then + if test x"$no_x" != xyes; then dnl Add everything we need to compile and link X programs to GL_CFLAGS dnl and GL_X_LIBS. GL_CFLAGS="$X_CFLAGS" @@ -1203,10 +1213,10 @@ dnl and GL_X_LIBS. GL_save_LIBS="$LIBS" LIBS="$GL_X_LIBS" - FPTOOLS_SEARCH_LIBS([#include ], glEnd, $GL_search_list, have_GL=yes, have_GL=no) - FPTOOLS_SEARCH_LIBS([#include ], gluNewQuadric, $GLU_search_list, have_GLU=yes, have_GLU=no) - FPTOOLS_SEARCH_LIBS([#include ], glXChooseVisual, $GLX_search_list, have_GLX=yes, have_GLX=no) - FPTOOLS_SEARCH_LIBS([#include ], glutMainLoop, glut glut32, have_glut=yes, have_glut=no) + FPTOOLS_SEARCH_LIBS([#include ], glEnd, $GL_search_list, have_GL=yes, have_GL=no) + FPTOOLS_SEARCH_LIBS([#include ], gluNewQuadric, $GLU_search_list, have_GLU=yes, have_GLU=no) + FPTOOLS_SEARCH_LIBS([#include ], glXWaitX, $GLX_search_list, have_GLX=yes, have_GLX=no) + FPTOOLS_SEARCH_LIBS([#include ], glutMainLoop, glut glut32, have_glut=yes, have_glut=no) if test -n "$LIBS"; then GL_LIBS="$LIBS" @@ -1268,3 +1278,34 @@ else $2=""; fi; ]) + +dnl +dnl Check to see whether 'struct msghdr' contains msg_control +dnl +AC_DEFUN(FPTOOLS_MSGHDR_MSG_CONTROL, +[AC_CACHE_CHECK([for msg_control in struct msghdr], fptools_cv_struct_msghdr_msg_control, +[AC_TRY_COMPILE([#include +#include +#include ], [struct msghdr m; m.msg_control;], +fptools_cv_struct_msghdr_msg_control=yes, fptools_cv_struct_msghdr_msg_control=no)]) +if test $fptools_cv_struct_msghdr_msg_control = yes; then + AC_DEFINE(HAVE_MSGHDR_MSG_CONTROL) +fi +AC_SUBST(HAVE_MSGHDR_MSG_CONTROL)dnl +]) + +dnl +dnl Check to see whether 'struct msghdr' contains msg_accrights +dnl +AC_DEFUN(FPTOOLS_MSGHDR_MSG_ACCRIGHTS, +[AC_CACHE_CHECK([for msg_accrights in struct msghdr], fptools_cv_struct_msghdr_msg_accrights, +[AC_TRY_COMPILE([#include +#include +#include ], [struct msghdr m; m.msg_accrights;], +fptools_cv_struct_msghdr_msg_accrights=yes, fptools_cv_struct_msghdr_msg_accrights=no)]) +if test $fptools_cv_struct_msghdr_msg_accrights = yes; then + AC_DEFINE(HAVE_MSGHDR_MSG_ACCRIGHTS) +fi +AC_SUBST(HAVE_MSGHDR_MSG_ACCRIGHTS)dnl +]) +