From: David Elliott <dfe@tgwbd.org>
Date: Mon, 18 Feb 2008 22:50:15 +0000 (+0000)
Subject: Test for dlopen/dlerror on Mac OS X as with any other UNIX.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3e654768857f8186786e74735c89f8469a6b9a02

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/configure b/configure
index 45ba3b0287..bc37475e62 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /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.
 # 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_SHL_FUNCS=0
     if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-        if test "$USE_DARWIN" = 1; then
-                        HAVE_DL_FUNCS=1
-        elif test "$USE_DOS" = 1; then
+        if test "$USE_DOS" = 1; then
             HAVE_DL_FUNCS=0
         else
 
@@ -41328,7 +41326,7 @@ fi
 done
 
 
-                if test "$HAVE_DL_FUNCS" = 1; then
+                        if test "$HAVE_DL_FUNCS" = 1; then
 
 for ac_func in dlerror
 do
@@ -41425,7 +41423,7 @@ _ACEOF
 
 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; }
 if test "${ac_cv_lib_dl_dlerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41498,7 +41496,11 @@ fi
 fi
 done
 
+            fi
         fi
+
+                if test "$USE_DARWIN" = 1; then
+                        HAVE_DL_FUNCS=1
         fi
 
         if test "$HAVE_DL_FUNCS" = 0; then
diff --git a/configure.in b/configure.in
index 0386e44018..5ea5be3eb9 100644
--- a/configure.in
+++ b/configure.in
@@ -5153,10 +5153,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
     if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-        if test "$USE_DARWIN" = 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
+        if test "$USE_DOS" = 1; then
             HAVE_DL_FUNCS=0
         else
             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()
-        if test "$HAVE_DL_FUNCS" = 1; then
-            AC_CHECK_FUNCS(dlerror,
-                AC_DEFINE(HAVE_DLERROR),
-                [
-                    AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
-                ]
-            )
+            dnl check also for dlerror()
+            if test "$HAVE_DL_FUNCS" = 1; then
+                AC_CHECK_FUNCS(dlerror,
+                    AC_DEFINE(HAVE_DLERROR),
+                    [
+                        AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
+                    ]
+                )
+            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
 
         if test "$HAVE_DL_FUNCS" = 0; then