X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=f7f6c09b9011831be985c1ff9d23b32f4cb28707;hp=9da99da7a98ff25762a9ea9f19908e38bb8f6fea;hb=59fa6266f00b6edcfc20c491c8de9a1b215dfa22;hpb=f6a9dff693c6723254273c73d7df503aa269d558

diff --git a/configure.ac b/configure.ac
index 9da99da..f7f6c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -671,10 +671,8 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
-  if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
   if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
-  AC_SUBST(ghc_ge_605)dnl
   AC_SUBST(ghc_ge_607)dnl
   AC_SUBST(ghc_ge_609)dnl
 fi
@@ -682,6 +680,22 @@ fi
 # Check whether this GHC has editline installed
 FP_GHC_HAS_EDITLINE
 
+# Dummy arguments to print help for --with-editline-* arguments.
+# Those are actually passed to the editline package's configure script
+# via the CONFIGURE_ARGS variable in mk/config.mk
+AC_ARG_WITH(dummy-editline-includes,
+  [AC_HELP_STRING([--with-editline-includes],
+    [directory containing editline/editline.h or editline/readline.h])],
+    [],
+    [])
+
+AC_ARG_WITH(dummy-editline-libraries,
+  [AC_HELP_STRING([--with-editline-libraries],
+    [directory containing the editline library])],
+    [],
+    [])
+
+
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -727,8 +741,9 @@ dnl ** Build shared and/or static libs?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(shared,
 [AC_HELP_STRING([--enable-shared],
-[Build shared libraries, if available. [default=no]])],
+[Build shared libraries, if available (EXPERIMENTAL, non-working). [default=no]])],
 [ if test x"$enableval" = x"yes"; then
+        AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time])
         BuildSharedLibs=YES
   else
         BuildSharedLibs=NO
@@ -836,20 +851,6 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then
 dnl  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 dnl fi
 
-dnl ** .NET interop support?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(dotnet,
-[AC_HELP_STRING([--enable-dotnet],
-[Build .NET interop layer. [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        DotnetSupport=YES; AC_DEFINE([WANT_DOTNET_SUPPORT], [1], [Define to 1 if you want to include .NET interop support.])
-  else
-        DotnetSupport=NO
-  fi],
-[DotnetSupport=NO]
-)
-AC_SUBST(DotnetSupport)
-
 dnl ** Mac OS X: explicit deployment target
 dnl --------------------------------------------------------------
 AC_ARG_WITH([macosx-deployment-target],
@@ -1028,7 +1029,7 @@ dnl    off_t, because it will affect the result of that test.
 AC_SYS_LARGEFILE
 
 dnl ** check for specific header (.h) files that we are interested in
-AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h])
+AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h sched.h])
 
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
@@ -1106,7 +1107,20 @@ fi
 
 dnl ** check for more functions
 dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
-AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r])
+AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r, sched_setaffinity])
+
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/time.h>
+int main(void) {
+  struct itimerval tval;
+  tval.it_value.tv_sec = 1;
+  tval.it_value.tv_usec = 0;
+  tval.it_interval = tval.it_value;
+  return setitimer(ITIMER_VIRTUAL, &tval, (void*)0) != 0;
+}
+],[AC_DEFINE([HAVE_SETITIMER_VIRTUAL], [1], [Define to 1 if setitimer accepts ITIMER_VIRTUAL, 0 else.])])
+
 dnl ** On OS X 10.4 (at least), time.h doesn't declare ctime_r if
 dnl ** _POSIX_C_SOURCE is defined
 AC_CHECK_DECLS([ctime_r], , ,
@@ -1276,6 +1290,26 @@ else
 fi
 AC_SUBST(HavePapi)
 
-AC_CONFIG_FILES([mk/config.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
+AC_CONFIG_FILES([mk/config.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
+
+# We get caught by
+#     http://savannah.gnu.org/bugs/index.php?1516
+#     $(eval ...) inside conditionals causes errors
+# with make 3.80, so warn the user if it looks like they're about to
+# try to use it.
+# We would use "grep -q" here, but Solaris's grep doesn't support it.
+checkMake380() {
+    if $1 --version 2>&1 | head -1 | grep 'GNU Make 3\.80' > /dev/null
+    then
+        echo
+        echo "WARNING: It looks like \"$1\" is GNU make 3.80."
+        echo "This version cannot be used to build GHC."
+        echo "Please use GNU make >= 3.81."
+    fi
+}
+
+checkMake380 make
+checkMake380 gmake
+