X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=cd13b2c85d0800ffb91b6494e92d88545468569a;hb=7a94452294ea68fa657c7ce1fa204c77062006c5;hp=5f6213417648338ea57346555fdcb975cbc99b83;hpb=720d4d424c8031e2ee61f01c28485a7ef12260b4;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 5f62134..cd13b2c 100644
--- a/configure.in
+++ b/configure.in
@@ -233,6 +233,15 @@ i[[3456]]86-next-nextstep3)
         HostVendor_CPP='next'
         HostOS_CPP='nextstep3'
         ;;
+m68k-*-openbsd*)
+	HostPlatform=m68k-unknown-openbsd
+	TargetPlatform=m68k-unknown-openbsd
+	BuildPlatform=m68k-unknown-openbsd
+        HostPlatform_CPP='m68k_unknown_openbsd'
+        HostArch_CPP='m68k'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 m68k-sun-sunos4*)
 	HostPlatform=m68k-sun-sunos4
 	TargetPlatform=m68k-sun-sunos4 #hack
@@ -486,6 +495,18 @@ if test x"$EnableWin32DLLs" = "xYES" ; then
  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 fi
 
+dnl ** Enable the building of the ObjectIO?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(objectio,
+[  --enable-objectio
+        Build ObjectIO, a portable GUI library for Haskell.
+        (This option is only relevant when libraries are built.)
+],
+[GhcLibsWithObjectIO=YES],
+[GhcLibsWithObjectIO=NO]
+)
+AC_SUBST(GhcLibsWithObjectIO)
+
 dnl ** Enable the building of the OpenGL/GLUT binding in hslibs?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hopengl,
@@ -666,6 +687,16 @@ if test "$BootingFromHc" = "NO"; then
 FPTOOLS_HAPPY
 fi;
 
+AC_ARG_ENABLE(src-tree-haddock,
+[  --enable-src-tree-haddock
+        Build and use source tree (fptools/haddock) version of haddock.
+],
+[UseSrcTreeHaddock=YES],
+[UseSrcTreeHaddock=NO]
+)
+dnl ** check for installed haddock
+FPTOOLS_HADDOCK
+
 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------
@@ -1016,7 +1047,7 @@ AC_EGREP_CPP(yes,
   ])    
 AC_SUBST(HaveRtldNext)
 
-dnl ** RTLD_LOCAL isn't available on cygwin
+dnl ** RTLD_LOCAL isn't available on cygwin or openbsd
 AC_MSG_CHECKING(for RTLD_LOCAL from dlfcn.h)
 AC_EGREP_CPP(yes,
 [
@@ -1034,6 +1065,42 @@ AC_EGREP_CPP(yes,
   ])    
 AC_SUBST(HaveRtldLocal)
 
+dnl ** RTLD_GLOBAL isn't available on openbsd
+AC_MSG_CHECKING(for RTLD_GLOBAL from dlfcn.h)
+AC_EGREP_CPP(yes,
+[
+ #include <dlfcn.h>
+ #ifdef RTLD_GLOBAL
+        yes
+ #endif
+], [
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_RTLDGLOBAL)
+  HaveRtldGlobal=YES
+], [
+  AC_MSG_RESULT(no)
+  HaveRtldGlobal=NO
+  ])    
+AC_SUBST(HaveRtldGlobal)
+
+dnl ** RTLD_NOW isn't available on openbsd
+AC_MSG_CHECKING(for RTLD_NOW from dlfcn.h)
+AC_EGREP_CPP(yes,
+[
+ #include <dlfcn.h>
+ #ifdef RTLD_NOW
+        yes
+ #endif
+], [
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_RTLDNOW)
+  HaveRtldNow=YES
+], [
+  AC_MSG_RESULT(no)
+  HaveRtldNow=NO
+  ])    
+AC_SUBST(HaveRtldNow)
+
 FPTOOLS_CHECK_LIB_NOWARN(m, atan)
 
 dnl --------------------------------------------------