octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Changeset Mac: Use dlopen instead of dyld per default


From: Thomas Treichl
Subject: Changeset Mac: Use dlopen instead of dyld per default
Date: Wed, 02 Sep 2009 21:25:08 +0200
User-agent: Thunderbird 2.0.0.23 (Macintosh/20090812)

Hi,

I'm compiling the Octave sources against Mac's dlopen libraries instead of Mac's dyld. For this I have created a option I'd like to see directly in the Octave sources. If given the flag

  ./configure --with-mach-dyld

then Octave should be compiled the "old way". Not given this flag checks for 
dlopen.

This change should be tested on more than just my machine - so please don't make bigger changes, eg. don't remove any of the dyld codes right now, as long as we don't have the feedback that things still work on other machines and dlopen works on all Macs as expected. The big changes (my suggestion) should be made before any of the next stable releases.

Best regards

  Thomas
# HG changeset patch
# User Thomas Treichl <address@hidden>
# Date 1251919460 -7200
# Node ID b5a79c431e4c740c79e4a0cd17d5c6c1696fd619
# Parent  dfc68e6d8741270cdb654446e6aa6e9d41eb7a51
Add support for dlopen on Mac systems.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-02  Thomas Treichl  <address@hidden>
+
+       * configure.in: Add support for dlopen on Mac systems.
+
 2009-09-02  Jaroslav Hajek  <address@hidden>
 
        * configure.in (FLOAT_TRUNCATE): New config macro.
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1564,10 +1564,15 @@
   ## Check for dyld first since OS X can have a non-standard libdl     
 
   save_LIBS="$LIBS"
-  AC_CHECK_HEADER(mach-o/dyld.h)
-  if test "$ac_cv_header_mach_o_dyld_h" = yes; then
-    dyld_api=true
-  else 
+  AC_ARG_WITH(mach-dyld,
+    [AS_HELP_STRING([--with-mach-dyld], [enable older Mach-O dyld interface])],
+    with_mach_dyld=yes, with_mach_dyld=$withval)
+  if test "$with_mach_dyld" = yes; then
+    AC_CHECK_HEADER(mach-o/dyld.h)
+    if test "$ac_cv_header_mach_o_dyld_h" = yes; then
+      dyld_api=true
+    fi
+  elif test "$dyld_api" = false; then
     AC_CHECK_LIB(dld, shl_load, [DL_LIBS=-ldld; LIBS="$LIBS $DL_LIBS"])
     AC_CHECK_FUNCS(shl_load shl_findsym)
     if test "$ac_cv_func_shl_load" = yes \

reply via email to

[Prev in Thread] Current Thread [Next in Thread]