Revert CorePrep part of "Completely new treatment of INLINE pragmas..."

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 73d812d..31281c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11.20081214], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
@@ -680,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)
 
@@ -725,7 +741,7 @@ 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
@@ -835,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],