From: Ian Lynagh <igloo@earth.li>
Date: Wed, 9 Jul 2008 13:57:22 +0000 (+0000)
Subject: ObjectIO is no longer an extralib
X-Git-Tag: Before_cabalised-GHC~48
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=80d2e6f711d54f59c4d698c7565f69d49d34d8b8

ObjectIO is no longer an extralib
---

diff --git a/.darcs-boring b/.darcs-boring
index fdbae8f..ffe68be 100644
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -33,7 +33,6 @@
 ^libraries/HUnit(/|$)
 ^libraries/HaXml(/|$)
 ^libraries/Japi(/|$)
-^libraries/ObjectIO(/|$)
 ^libraries/OpenAL(/|$)
 ^libraries/OpenGL(/|$)
 ^libraries/QuickCheck(/|$)
diff --git a/configure.ac b/configure.ac
index 167de58..e677ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -807,21 +807,6 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then
 dnl  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 dnl fi
 
-dnl ** Enable the building of the ObjectIO?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(objectio,
-[AC_HELP_STRING([--enable-objectio],
-[Build ObjectIO, a portable GUI library for Haskell. [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        GhcLibsWithObjectIO=YES
-  else
-        GhcLibsWithObjectIO=NO
-  fi
-],
-[GhcLibsWithObjectIO=NO]
-)
-AC_SUBST(GhcLibsWithObjectIO)
-
 dnl ** .NET interop support?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(dotnet,
diff --git a/libraries/Makefile b/libraries/Makefile
index 4a75932..ed8bb94 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -70,9 +70,6 @@ SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard cgi)
-ifeq "$(GhcLibsWithObjectIO)" "YES"
-SUBDIRS += $(wildcard ObjectIO)
-endif
 SUBDIRS += $(wildcard parallel)
 SUBDIRS_BUILD += $(wildcard ndp)
 SUBDIRS_BUILD += $(wildcard dph/dph-base)
diff --git a/libraries/extra-packages b/libraries/extra-packages
index 5aba9ff..cbfbe68 100644
--- a/libraries/extra-packages
+++ b/libraries/extra-packages
@@ -1,7 +1,6 @@
 ALUT
 GLUT
 HUnit
-ObjectIO
 OpenAL
 OpenGL
 QuickCheck
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6fce451..28b57a7 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -442,10 +442,6 @@ SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\
 # Math library
 LIBM=@LIBM@
 
-# Build the ObjectIO ?
-#
-GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
-
 # .NET interop support?
 #
 DotnetSupport=@DotnetSupport@