From 0e89dd445e49365b9c87da57bbe9e165c292b7eb Mon Sep 17 00:00:00 2001 From: ross Date: Tue, 20 Sep 2005 16:35:26 +0000 Subject: [PATCH] [project @ 2005-09-20 16:35:26 by ross] move RTLD_* tests down to unix package --- configure.ac | 92 +------------------------------------------------------ mk/config.mk.in | 2 -- 2 files changed, 1 insertion(+), 93 deletions(-) diff --git a/configure.ac b/configure.ac index 6d33854..0efe723 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,7 +1149,7 @@ dnl ################################################################ dnl Check for libraries dnl ################################################################ -dnl ** check for libdl & RTLD_NEXT +dnl ** check whether we need -ldl to get dlopen() AC_CHECK_LIB(dl, dlopen, [HaveLibDL=YES @@ -1158,96 +1158,6 @@ AC_CHECK_LIB(dl, dlopen, [HaveLibDL=NO]) 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 - #ifdef RTLD_NEXT - yes - #endif -], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RTLDNEXT], [1], [Define to 1 if we can see RTLD_NEXT in dlfcn.h.]) - HaveRtldNext=YES -], [ - AC_MSG_RESULT(no) - HaveRtldNext=NO - ]) -AC_SUBST(HaveRtldNext) - -dnl ** RTLD_DEFAULT isn't available on cygwin -AC_MSG_CHECKING(for RTLD_DEFAULT from dlfcn.h) -AC_EGREP_CPP(yes, -[ - #include - #ifdef RTLD_DEFAULT - yes - #endif -], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RTLDDEFAULT], [1], [Define to 1 if RTLD_DEFAULT is available.]) - HaveRtldDefault=YES -], [ - AC_MSG_RESULT(no) - HaveRtldDefault=NO - ]) -AC_SUBST(HaveRtldDefault) - -dnl ** RTLD_LOCAL isn't available on cygwin or openbsd -AC_MSG_CHECKING(for RTLD_LOCAL from dlfcn.h) -AC_EGREP_CPP(yes, -[ - #include - #ifdef RTLD_LOCAL - yes - #endif -], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RTLDLOCAL], [1], [Define to 1 if RTLD_LOCAL is available.]) - 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 - #ifdef RTLD_GLOBAL - yes - #endif -], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RTLDGLOBAL], [1], [Define to 1 if RTLD_GLOBAL is available.]) - 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 - #ifdef RTLD_NOW - yes - #endif -], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RTLDNOW], [1], [Define to 1 if we can see RTLD_NOW in dlfcn.h]) - HaveRtldNow=YES -], [ - AC_MSG_RESULT(no) - HaveRtldNow=NO - ]) -AC_SUBST(HaveRtldNow) - dnl -------------------------------------------------- dnl * Miscellaneous feature tests dnl -------------------------------------------------- diff --git a/mk/config.mk.in b/mk/config.mk.in index 6100d1e..1a0076b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -265,8 +265,6 @@ endif GhcWithJavaGen=NO HaveLibDL = @HaveLibDL@ -HaveRtldNext = @HaveRtldNext@ -HaveRtldLocal = @HaveRtldLocal@ # Whether to include GHCi in the compiler. Depends on whether the RTS linker # has support for this OS/ARCH combination. -- 1.7.10.4