[project @ 2002-07-23 11:25:27 by simonmar]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index da1ca9c..925bf5b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -675,6 +675,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 --------------------------------------------------
@@ -1025,7 +1035,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,
 [
@@ -1043,6 +1053,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 --------------------------------------------------