Commit 80d2e6f7 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

ObjectIO is no longer an extralib

parent ccc9a4a5
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
^libraries/HUnit(/|$) ^libraries/HUnit(/|$)
^libraries/HaXml(/|$) ^libraries/HaXml(/|$)
^libraries/Japi(/|$) ^libraries/Japi(/|$)
^libraries/ObjectIO(/|$)
^libraries/OpenAL(/|$) ^libraries/OpenAL(/|$)
^libraries/OpenGL(/|$) ^libraries/OpenGL(/|$)
^libraries/QuickCheck(/|$) ^libraries/QuickCheck(/|$)
......
...@@ -807,21 +807,6 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then ...@@ -807,21 +807,6 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then
dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT) dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
dnl fi 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 ** .NET interop support?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
AC_ARG_ENABLE(dotnet, AC_ARG_ENABLE(dotnet,
......
...@@ -70,9 +70,6 @@ SUBDIRS += $(wildcard ALUT) ...@@ -70,9 +70,6 @@ SUBDIRS += $(wildcard ALUT)
SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard stm)
SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard xhtml)
SUBDIRS += $(wildcard cgi) SUBDIRS += $(wildcard cgi)
ifeq "$(GhcLibsWithObjectIO)" "YES"
SUBDIRS += $(wildcard ObjectIO)
endif
SUBDIRS += $(wildcard parallel) SUBDIRS += $(wildcard parallel)
SUBDIRS_BUILD += $(wildcard ndp) SUBDIRS_BUILD += $(wildcard ndp)
SUBDIRS_BUILD += $(wildcard dph/dph-base) SUBDIRS_BUILD += $(wildcard dph/dph-base)
......
ALUT ALUT
GLUT GLUT
HUnit HUnit
ObjectIO
OpenAL OpenAL
OpenGL OpenGL
QuickCheck QuickCheck
......
...@@ -442,10 +442,6 @@ SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\ ...@@ -442,10 +442,6 @@ SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\
# Math library # Math library
LIBM=@LIBM@ LIBM=@LIBM@
# Build the ObjectIO ?
#
GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
# .NET interop support? # .NET interop support?
# #
DotnetSupport=@DotnetSupport@ DotnetSupport=@DotnetSupport@
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment