X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=a75df17d5cdf85db6156e0327bee232feb6c7402;hb=46031a35867ea145bfeb19d1afa006c5d6c9d1c4;hp=84daf870db5bb4355631630f3c38cf8ccd006ef3;hpb=9bd50a0ddd9cefbe66fef99a06740c40b59d4ebe;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 84daf87..a75df17 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.98 2002/03/12 09:23:01 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.103 2002/05/31 21:12:28 sof Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -214,21 +214,12 @@ else
 fi;
 changequote([, ])dnl
 ])
-if test -d $srcdir/ghc; then
+if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; 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
 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
@@ -1263,3 +1254,32 @@ 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 <sys/uio.h>
+#include <sys/socket.h>], [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 <sys/uio.h>
+#include <sys/socket.h>], [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
+])
+