X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=50f9fc8cc2eeaf5926ead3714f29a00108bcd3b6;hb=247e8ad162edd7fb57396193aacfc5d7c56a2727;hp=b2bb123a915fd0147cfa1005c4c58524c82be569;hpb=5ca28d195c55751280886c194b9541af97cb77cc;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index b2bb123..50f9fc8 100644
--- a/configure.in
+++ b/configure.in
@@ -496,27 +496,36 @@ AC_SUBST(ThreadedRts)
 
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
-AC_ARG_ENABLE(win32-dlls,
-[  --enable-win32-dlls
-        If on a Win32 platform running mingw32/cygwin, enable the
-	construction of DLLs containing ghc-compiled code.
-],
-[
-case $HostOS_CPP in
-cygwin32) ;;
-mingw32)  ;;
-*)    echo "Unrecognised win32 platform: $HostPlatform"
-      exit 1
-      ;;
-esac
-EnableWin32DLLs=YES
-],
-[EnableWin32DLLs=NO]
-)
-AC_SUBST(EnableWin32DLLs)
-if test x"$EnableWin32DLLs" = "xYES" ; then
- AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
-fi
+dnl
+dnl [ The ability to build the RTS and libraries as separate DLLs used
+dnl   to be supported, but isn't currently (updates to the RTS, compiler 
+dnl   and build system would be required to bring it back again.)
+dnl   Hence, exposing it as an option is false advertisement, so better
+dnl   disable it to avoid confusion (but leave it commented-out rather
+dnl   than removed in order to remind ourselves to bring back the 
+dnl   feature at some stage.) ]
+dnl
+dnl AC_ARG_ENABLE(win32-dlls,
+dnl [  --enable-win32-dlls
+dnl         If on a Win32 platform running mingw32/cygwin, enable the
+dnl 	construction of DLLs containing ghc-compiled code.
+dnl ],
+dnl [
+dnl case $HostOS_CPP in
+dnl cygwin32) ;;
+dnl mingw32)  ;;
+dnl *)    echo "Unrecognised win32 platform: $HostPlatform"
+dnl       exit 1
+dnl       ;;
+dnl esac
+dnl EnableWin32DLLs=YES
+dnl ],
+dnl [EnableWin32DLLs=NO]
+dnl )
+dnl AC_SUBST(EnableWin32DLLs)
+dnl if test x"$EnableWin32DLLs" = "xYES" ; then
+dnl  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
+dnl fi
 
 dnl ** Enable the building of the ObjectIO?
 dnl --------------------------------------------------------------
@@ -722,7 +731,7 @@ FPTOOLS_GREENCARD(3.00)
 
 AC_ARG_ENABLE(src-tree-happy,
 [  --enable-src-tree-happy
-        Build and use source tree (fptools/happy) version of happy.
+        Build and use source tree (fptools/happy) version of Happy.
 ],
 [UseSrcTreeHappy=YES],
 [UseSrcTreeHappy=NO]
@@ -735,7 +744,7 @@ fi;
 
 AC_ARG_ENABLE(src-tree-haddock,
 [  --enable-src-tree-haddock
-        Build and use source tree (fptools/haddock) version of haddock.
+        Build and use source tree (fptools/haddock) version of Haddock.
 ],
 [UseSrcTreeHaddock=YES],
 [UseSrcTreeHaddock=NO]
@@ -743,6 +752,19 @@ AC_ARG_ENABLE(src-tree-haddock,
 dnl ** check for installed haddock
 FPTOOLS_HADDOCK
 
+AC_ARG_ENABLE(src-tree-alex,
+[  --enable-src-tree-alex
+        Build and use source tree (fptools/alex) version of Alex.
+],
+[UseSrcTreeAlex=YES],
+[UseSrcTreeAlex=NO]
+)
+dnl ** check for installed alex binary + version
+dnl    (don't do it if we're booting from .hc files though.)
+if test "$BootingFromHc" = "NO"; then
+FPTOOLS_ALEX
+fi;
+
 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------