Backport of r68146

diff --git a/Makefile.pre.in b/Makefile.pre.in
index b82b3a640542ad5531eb4041834881b5bb339ce7..569bec29dbc7604f6c44067c159c48cf4e59f343 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -414,10 +414,14 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
        if test $(INSTSONAME) != $(LDLIBRARY); then \
                $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
                $(LN) -f $(INSTSONAME) $@; \
-       else\
+       else \
                $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
        fi
 
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
+        $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+                
+
 libpython$(VERSION).sl: $(LIBRARY_OBJS)
        $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
 
@@ -768,13 +772,13 @@ altbininstall:    $(BUILDPYTHON)
                fi; \
        done
        $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
-       if test -f libpython$(VERSION)$(SO); then \
+       if test -f $(LDLIBRARY); then \
                if test "$(SO)" = .dll; then \
-                       $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
+                       $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(BINDIR); \
                else \
-                       $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
-                       if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
-                               (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
+                       $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
+                       if test $(LDLIBRARY) != $(INSTSONAME); then \
+                               (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
                        fi \
                fi; \
        else    true; \

diff --git a/configure b/configure
index ce8cc29fb4abb8a23fded7b5ecda7762c70aab8a..f62d747d05ccd909b8514e3e7e508e9f2e5a0a01 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 67229 .
+# From configure.in Revision: 67565 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.6.
 #
@@ -4139,6 +4139,12 @@ _ACEOF
          BLDLIBRARY='-L. -lpython$(VERSION)'
          RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
          ;;
+    Darwin*)
+       LDLIBRARY='libpython$(VERSION).dylib'
+       BLDLIBRARY='-L. -lpython$(VERSION)'
+       RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
+       ;;
+
   esac
 else # shared is disabled
   case $ac_sys_system in
@@ -13003,6 +13009,7 @@ fi
 { echo "$as_me:$LINENO: result: $SO" >&5
 echo "${ECHO_T}$SO" >&6; }
 
+
 cat >>confdefs.h <<_ACEOF
 #define SHLIB_EXT "$SO"
 _ACEOF
@@ -13403,7 +13410,7 @@ _ACEOF
 fi
        # Dynamic linking for HP-UX
 
-# only check for sem_ini if thread support is requested
+# only check for sem_init if thread support is requested
 if test "$with_threads" = "yes" -o -z "$with_threads"; then
     { echo "$as_me:$LINENO: checking for library containing sem_init" >&5
 echo $ECHO_N "checking for library containing sem_init... $ECHO_C" >&6; }

diff --git a/configure.in b/configure.in
index cf70489a3d569199092901a3ff144660ce53e8f8..3b1736bee4dc08c564b2f1fd638c375b9b51d338 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -737,6 +737,12 @@ if test $enable_shared = "yes"; then
          BLDLIBRARY='-L. -lpython$(VERSION)'
          RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
          ;;
+    Darwin*)
+       LDLIBRARY='libpython$(VERSION).dylib'
+       BLDLIBRARY='-L. -lpython$(VERSION)'
+       RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
+       ;;
+
   esac
 else # shared is disabled
   case $ac_sys_system in
@@ -1597,6 +1603,7 @@ else
        sleep 10
 fi
 AC_MSG_RESULT($SO)
+
 AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).])
 # LDSHARED is the ld *command* used to create shared library
 # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5