Separate suffixes of shared libraries that we link against and the ones

we load with dlopen(). This matters on Mac OS X, for example.

diff --git a/Makefile.global b/Makefile.global
index 531fdcc89a5a026738caab8b85be2ee5573a9ea5..c92bc3724f809ac8ea5e05c2102db802cb07943d 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -25,10 +25,10 @@ install: $(all_targets) $(install_targets)
 install-sapi: $(OVERALL_TARGET)
        @echo "Installing PHP SAPI module:       $(PHP_SAPI)"
        -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-       -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
+       -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \
                for i in 0.0.0 0.0 0; do \
-                       if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
-                               $(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
+                       if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+                               $(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \
                                break; \
                        fi; \
                done; \

diff --git a/acinclude.m4 b/acinclude.m4
index 33b286cfbdc5131aa7925296938567d788d761d0..2f7c71ef92639a260c26b12115419b4b05919c2f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1877,20 +1877,43 @@ dnl Platform characteristics checks
 dnl -------------------------------------------------------------------------
 
 dnl
-dnl PHP_SHLIB_SUFFIX_NAME
+dnl PHP_SHLIB_BUILD_SUFFIX_NAME
 dnl
-dnl Determines shared library suffix 
+dnl Determines link library suffix
 dnl suffix can be: .so, .sl or .dylib
 dnl
+AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[
+ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
+ PHP_SUBST(SHLIB_SUFFIX_NAME)
+ SHLIB_SUFFIX_NAME=so
+ case $host_alias in
+ *hpux*[)]
+   SHLIB_SUFFIX_NAME=sl
+   ;;
+ *darwin*[)]
+   SHLIB_SUFFIX_NAME=dylib
+   ;;
+ esac
+])
+
+dnl
+dnl PHP_SHLIB_SUFFIX_NAME
+dnl
+dnl Determines shared library suffix
+dnl suffix can be: .so or .sl
+dnl
 AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
-  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
-  PHP_SUBST(SHLIB_SUFFIX_NAME)
-  SHLIB_SUFFIX_NAME=so
-  case $host_alias in
-  *hpux*[)]
-    SHLIB_SUFFIX_NAME=sl
-    ;;
-  esac
+ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
+ PHP_SUBST(SHLIB_DL_SUFFIX_NAME)
+ SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
+ case $host_alias in
+ *hpux*[)]
+   SHLIB_DL_SUFFIX_NAME=sl
+   ;;
+ *darwin*[)]
+   SHLIB_DL_SUFFIX_NAME=so
+   ;;
+ esac
 ])
 
 dnl

diff --git a/configure.in b/configure.in
index e54b4f1e1e9b1c9d1f7e63a141458f24f70ba933..b4b376ade3e66ede90df6de3a42354e972dfff0c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -225,6 +225,7 @@ dnl -------------------------------------------------------------------------
 PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAME
+PHP_SHLIB_BUILD_SUFFIX_NAME
 PHP_SAPI=default
 PHP_BUILD_PROGRAM
 
@@ -233,7 +234,7 @@ dnl SAPI configuration.
 dnl -------------------------------------------------------------------------
 
 dnl paths to the targets are relative to the build directory
-SAPI_SHARED=libs/libphp5.$SHLIB_SUFFIX_NAME
+SAPI_SHARED=libs/libphp5.$SHLIB_DL_SUFFIX_NAME
 SAPI_STATIC=libs/libphp5.a
 SAPI_LIBTOOL=libphp5.la
 
@@ -1148,6 +1149,7 @@ PHP_SUBST(WARNING_LEVEL)
 PHP_SUBST(PHP_FRAMEWORKS)
 PHP_SUBST(PHP_FRAMEWORKPATH)
 PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
+PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
 PHP_SUBST(INSTALL_HEADERS)
 
 old_CC=$CC

diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index 4ee66b87a656a1d739578eebe3430e45ebe6a81e..1e0a924511b9dc9e95e63918c1f1aa47b86fe4c6 100644 (file)
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -87,4 +87,4 @@
 #define PHP_LOCALSTATEDIR       "@EXPANDED_LOCALSTATEDIR@"
 #define PHP_CONFIG_FILE_PATH    "@EXPANDED_PHP_CONFIG_FILE_PATH@"
 #define PHP_CONFIG_FILE_SCAN_DIR    "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
-#define PHP_SHLIB_SUFFIX        "@SHLIB_SUFFIX_NAME@"
+#define PHP_SHLIB_SUFFIX        "@SHLIB_DL_SUFFIX_NAME@"

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 62618f7ee7d12cdb9969178682fd6564f6ae5ab5..de2d3a2f800c6b96d137e819c6572f187a802a23 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -60,6 +60,7 @@ AC_ARG_WITH(libdir,
 
 PHP_RUNPATH_SWITCH
 PHP_SHLIB_SUFFIX_NAME
+PHP_SHLIB_BUILD_SUFFIX_NAME
 PHP_WITH_PHP_CONFIG
 
 PHP_BUILD_SHARED