X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=f4ba4dbec3657dda02a2a6ed7d842113c0f73802;hb=11b059fe35fe7bdcf43d4ce3246d0b9ae1671391;hp=e677ad89e7fe347370b555674deaa349ec7dfee3;hpb=80d2e6f711d54f59c4d698c7565f69d49d34d8b8;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index e677ad8..f4ba4db 100644
--- 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.9], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
@@ -723,6 +723,35 @@ AC_ARG_WITH(ld,
  [FP_PROG_LD()]
 )
 
+dnl ** Build shared and/or static libs?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(shared,
+[AC_HELP_STRING([--enable-shared],
+[Build shared libraries, if available. [default=no]])],
+[ if test x"$enableval" = x"yes"; then
+        BuildSharedLibs=YES
+  else
+        BuildSharedLibs=NO
+  fi
+],
+[BuildSharedLibs=NO]
+)
+AC_SUBST(BuildSharedLibs)
+
+# ToDo later:
+# AC_ARG_ENABLE(static,
+# [AC_HELP_STRING([--enable-static],
+# [Build static libraries. [default=yes]])],
+# [ if test x"$enableval" = x"yes"; then
+#         BuildStaticLibs=YES
+#   else
+#         BuildStaticLibs=NO
+#   fi
+# ],
+# [BuildStaticLibs=YES]
+# )
+# AC_SUBST(BuildStaticLibs)
+
 dnl ** Booting from .hc files?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hc-boot,
@@ -1247,6 +1276,6 @@ else
 fi
 AC_SUBST(HavePapi)
 
-AC_CONFIG_FILES([mk/config.mk ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
+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_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT