macosx: prepare the switch from dyld to 'Dynamic Loader Compatibility Functions'...

Using Apple's legacy object file image functions around NSModule is strongly discouraged and won't work in the future at all.

diff --git a/configure.ac b/configure.ac
index 69a1831b0ddc75745f3cb5ce24ae40b47e81505c..807f12867847dd8cb32373dd4383e977611d36d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -791,7 +791,7 @@ if test "${ac_cv_have_plugins}" = "no"; then
 fi
 
 # Only test for dlopen() if the others didn't work
-if test "${ac_cv_have_plugins}" = "no"; then
+if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
   AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
   ac_cv_my_have_dlopen=no
   AC_CHECK_FUNC(dlopen,

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 00836dde077124bc8c537967396cab7afe549868..252abe5b491faf8834a81bb569bf89a0f9d0a1cb 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -76,7 +76,7 @@ struct module_cache_t
 #define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
-#if defined(HAVE_DL_DYLD)
+#if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
 #   if defined (HAVE_MACH_O_DYLD_H)
 #       include <mach-o/dyld.h>
 #   endif