AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test for dlopen/dlerror on Mac OS X as with any other UNIX.

Browse Source 
Indent dlerror test appropriately.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2008-02-18 22:50:15 +00:00
parent c86ec17bcd
commit 3e65476885
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 51614 2008-02-09 14:40:26Z VZ . # From configure.in Id: configure.in 51632 2008-02-10 17:03:23Z VZ .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
# #
@ -40973,9 +40973,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
HAVE_DL_FUNCS=0 HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0 HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
if test "$USE_DARWIN" = 1; then if test "$USE_DOS" = 1; then
HAVE_DL_FUNCS=1
elif test "$USE_DOS" = 1; then
HAVE_DL_FUNCS=0 HAVE_DL_FUNCS=0
else else
@ -41328,7 +41326,7 @@ fi
done done
if test "$HAVE_DL_FUNCS" = 1; then if test "$HAVE_DL_FUNCS" = 1; then
for ac_func in dlerror for ac_func in dlerror
do do
@ -41425,7 +41423,7 @@ _ACEOF
else else
{ echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5 { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; } echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlerror+set}" = set; then if test "${ac_cv_lib_dl_dlerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -41498,7 +41496,11 @@ fi
fi fi
done done
fi
fi fi
if test "$USE_DARWIN" = 1; then
HAVE_DL_FUNCS=1
fi fi
if test "$HAVE_DL_FUNCS" = 0; then if test "$HAVE_DL_FUNCS" = 0; then

27
configure.in
View File

@ -5153,10 +5153,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
HAVE_DL_FUNCS=0 HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0 HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
if test "$USE_DARWIN" = 1; then if test "$USE_DOS" = 1; then
dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
HAVE_DL_FUNCS=1
elif test "$USE_DOS" = 1; then
HAVE_DL_FUNCS=0 HAVE_DL_FUNCS=0
else else
dnl the test is a bit complicated because we check for dlopen() both with dnl the test is a bit complicated because we check for dlopen() both with
@ -5190,15 +5187,21 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
]) ])
]) ])
dnl check also for dlerror() dnl check also for dlerror()
if test "$HAVE_DL_FUNCS" = 1; then if test "$HAVE_DL_FUNCS" = 1; then
AC_CHECK_FUNCS(dlerror, AC_CHECK_FUNCS(dlerror,
AC_DEFINE(HAVE_DLERROR), AC_DEFINE(HAVE_DLERROR),
[ [
AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)) AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
] ]
) )
fi
fi fi
dnl Force HAVE_DL_FUNCS on for Darwin, even if the tests failed (e.g. pre-10.3)
if test "$USE_DARWIN" = 1; then
dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
HAVE_DL_FUNCS=1
fi fi
if test "$HAVE_DL_FUNCS" = 0; then if test "$HAVE_DL_FUNCS" = 0; then