X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=32f7b262956eb84d45b2233b9c8edf99a664abab;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=36e28c8e6da86d4484208187b9a51c8dfa2b8c17;hpb=a5b47be19ba3a736aa60728dba43a14cd0cbe5a4;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 36e28c8..32f7b26 100644
--- a/configure.in
+++ b/configure.in
@@ -953,6 +953,21 @@ AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
 AC_SUBST(HaveLibGmp)
 AC_SUBST(LibGmp)
 
+dnl ** (Mac OS X only: check for HaskellSupport.framework)
+HaveFrameworkHaskellSupport=NO
+if test $HostPlatform = "powerpc-apple-darwin"; then
+ AC_MSG_CHECKING([for HaskellSupport.framework])
+ save_libs="$LIBS"
+ LIBS="-framework HaskellSupport"
+ AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,)
+ if test $HaveFrameworkHaskellSupport = YES; then
+  AC_DEFINE(HAVE_FRAMEWORK_HASKELLSUPPORT)
+ fi;
+ LIBS="$save_libs"
+ AC_MSG_RESULT([$HaveFrameworkHaskellSupport])
+fi;
+AC_SUBST(HaveFrameworkHaskellSupport)
+
 dnl ** check for mingwex library
 AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO)
 AC_SUBST(HaveLibMingwEx)
@@ -1027,85 +1042,104 @@ dnl ################################################################
 
 dnl ** check for libdl & RTLD_NEXT
 
-AC_CHECK_LIB(dl, dlopen, 
-	[HaveLibDL=YES
-	 AC_DEFINE(HAVE_LIBDL)
-	 LIBS="$LIBS -ldl"], 
-	[HaveLibDL=NO])
-AC_CHECK_FUNCS(dlopen)
-AC_SUBST(HaveLibDL)
-
-dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set
-AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
-AC_EGREP_CPP(yes,
-[
- #include <dlfcn.h>
- #ifdef RTLD_NEXT
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_RTLDNEXT)
-  HaveRtldNext=YES
-], [
-  AC_MSG_RESULT(no)
-  HaveRtldNext=NO
-  ])    
-AC_SUBST(HaveRtldNext)
-
-dnl ** RTLD_LOCAL isn't available on cygwin or openbsd
-AC_MSG_CHECKING(for RTLD_LOCAL from dlfcn.h)
-AC_EGREP_CPP(yes,
-[
- #include <dlfcn.h>
- #ifdef RTLD_LOCAL
-        yes
- #endif
-], [
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_RTLDLOCAL)
-  HaveRtldLocal=YES
-], [
-  AC_MSG_RESULT(no)
-  HaveRtldLocal=NO
-  ])    
-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)
+dnl (Mac OS X only) ... but don't check if we already have the
+dnl HaskellSupport.framework
+
+if test $HaveFrameworkHaskellSupport = YES; then
+    HaveLibDL = NO
+    HaveRtldNext=NO
+    HaveRtldLocal=YES
+    AC_DEFINE(HAVE_RTLDLOCAL)
+    HaveRtldGlobal=YES
+    AC_DEFINE(HAVE_RTLDGLOBAL)
+    HaveRtldNow=YES
+    AC_DEFINE(HAVE_RTLDNOW)
+    AC_SUBST(HaveLibDL)
+    AC_SUBST(HaveRtldNext)
+    AC_SUBST(HaveRtldLocal)
+    AC_SUBST(HaveRtldGlobal)
+    AC_SUBST(HaveRtldNow)
+else
+    AC_CHECK_LIB(dl, dlopen, 
+    	[HaveLibDL=YES
+    	 AC_DEFINE(HAVE_LIBDL)
+    	 LIBS="$LIBS -ldl"], 
+    	[HaveLibDL=NO])
+    AC_CHECK_FUNCS(dlopen)
+    AC_SUBST(HaveLibDL)
+
+    dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set
+    AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
+    AC_EGREP_CPP(yes,
+    [
+     #include <dlfcn.h>
+     #ifdef RTLD_NEXT
+            yes
+     #endif
+    ], [
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_RTLDNEXT)
+      HaveRtldNext=YES
+    ], [
+      AC_MSG_RESULT(no)
+      HaveRtldNext=NO
+      ])    
+    AC_SUBST(HaveRtldNext)
+
+    dnl ** RTLD_LOCAL isn't available on cygwin or openbsd
+    AC_MSG_CHECKING(for RTLD_LOCAL from dlfcn.h)
+    AC_EGREP_CPP(yes,
+    [
+     #include <dlfcn.h>
+     #ifdef RTLD_LOCAL
+            yes
+     #endif
+    ], [
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_RTLDLOCAL)
+      HaveRtldLocal=YES
+    ], [
+      AC_MSG_RESULT(no)
+      HaveRtldLocal=NO
+      ])    
+    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)
+fi
 
 FPTOOLS_CHECK_LIB_NOWARN(m, atan)
 
@@ -1128,6 +1162,14 @@ case "$cv_func_usleep_return_type" in
 esac
 
 dnl --------------------------------------------------
+dnl * test for in_addr_t
+dnl --------------------------------------------------
+AC_MSG_CHECKING(for in_addr_t in netinet/in.h)
+AC_EGREP_HEADER(in_addr_t, netinet/in.h,
+ [ AC_DEFINE(HAVE_IN_ADDR_T) AC_MSG_RESULT(yes) ],
+ AC_MSG_RESULT(no))
+
+dnl --------------------------------------------------
 dnl * test for GTK+
 dnl --------------------------------------------------