From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sat, 1 Aug 2009 23:41:00 +0000 (+0200)
Subject: macosx: prepare the switch from dyld to 'Dynamic Loader Compatibility Functions'... 
X-Git-Tag: 1.1.0-ff~4631
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a24f4cfec7d4688703beb98c34bb59459778178d;p=vlc

macosx: prepare the switch from dyld to 'Dynamic Loader Compatibility Functions' as partially intended by [7147338b7439f7f4a5d6d9c86e8d5d7a8501be4d]

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 69a1831b0d..807f128678 100644
--- 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 00836dde07..252abe5b49 100644
--- 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