diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-09 13:57:22 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-09 13:57:22 +0000 |
| commit | 80d2e6f711d54f59c4d698c7565f69d49d34d8b8 (patch) | |
| tree | f582f65e288c219b52baaad7b2c0229e80aa135f | |
| parent | ccc9a4a5c7131e5bece84c0983d7d3f8d6480967 (diff) | |
| download | haskell-80d2e6f711d54f59c4d698c7565f69d49d34d8b8.tar.gz | |
ObjectIO is no longer an extralib
| -rw-r--r-- | .darcs-boring | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | libraries/Makefile | 3 | ||||
| -rw-r--r-- | libraries/extra-packages | 1 | ||||
| -rw-r--r-- | mk/config.mk.in | 4 |
5 files changed, 0 insertions, 24 deletions
diff --git a/.darcs-boring b/.darcs-boring index fdbae8f32d..ffe68be7b5 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 167de58cfb..e677ad89e7 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 4a7593218c..ed8bb947da 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 5aba9ff890..cbfbe68b7a 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 6fce4518ec..28b57a7a9b 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@ |