Bug 593911 - Check for dlopen in the libc too. r=khuey a=bsmedberg

This commit is contained in:
Jory A. Pratt 2010-11-05 18:26:51 +01:00
parent 974d30cc03
commit b8260165be
5 changed files with 10 additions and 14 deletions

View File

@ -3408,11 +3408,9 @@ case $target in
*-os2*)
;;
*)
AC_CHECK_LIB(m, atan)
AC_CHECK_LIB(dl, dlopen,
AC_CHECK_HEADER(dlfcn.h,
LIBS="-ldl $LIBS"
AC_DEFINE(HAVE_LIBDL)))
AC_SEARCH_LIBS(dlopen, dl,
AC_CHECK_HEADER(dlfcn.h,
AC_DEFINE(HAVE_DLOPEN)))
;;
esac

View File

@ -3140,11 +3140,9 @@ case $target in
*-os2*)
;;
*)
AC_CHECK_LIB(m, atan)
AC_CHECK_LIB(dl, dlopen,
AC_CHECK_HEADER(dlfcn.h,
LIBS="-ldl $LIBS"
AC_DEFINE(HAVE_LIBDL)))
AC_SEARCH_LIBS(dlopen, dl,
AC_CHECK_HEADER(dlfcn.h,
AC_DEFINE(HAVE_DLOPEN)))
;;
esac

View File

@ -6348,7 +6348,7 @@ _malloc_postfork(void)
*/
/******************************************************************************/
#ifdef HAVE_LIBDL
#ifdef HAVE_DLOPEN
# include <dlfcn.h>
#endif

View File

@ -1137,7 +1137,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAddressDetails *aDetails,
#define __USE_GNU
#endif
#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
#include <dlfcn.h>
#endif

View File

@ -69,7 +69,7 @@
#include "mozilla/BlockingResourceBase.h"
#ifdef HAVE_LIBDL
#ifdef HAVE_DLOPEN
#include <dlfcn.h>
#endif
@ -730,7 +730,7 @@ static void InitTraceLog(void)
if (defined) {
gLogToLeaky = PR_TRUE;
PRFuncPtr p = nsnull, q = nsnull;
#ifdef HAVE_LIBDL
#ifdef HAVE_DLOPEN
{
PRLibrary *lib = nsnull;
p = PR_FindFunctionSymbolAndLibrary("__log_addref", &lib);