- Determine the shared/link lib suffixes in one macro.

diff --git a/acinclude.m4 b/acinclude.m4
index 2f7c71ef92639a260c26b12115419b4b05919c2f..3f27f6cdcef79de6ae1ed21491d0d3f8a529d4f4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1876,41 +1876,28 @@ dnl -------------------------------------------------------------------------
 dnl Platform characteristics checks
 dnl -------------------------------------------------------------------------
 
-dnl
-dnl PHP_SHLIB_BUILD_SUFFIX_NAME
-dnl
-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 Determines link library suffix SHLIB_SUFFIX_NAME
+dnl which can be: .so, .sl or .dylib
+dnl
+dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME
 dnl suffix can be: .so or .sl
 dnl
 AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
- PHP_SUBST(SHLIB_DL_SUFFIX_NAME)
+ PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
+ PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
+ SHLIB_SUFFIX_NAME=so
  SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
  case $host_alias in
  *hpux*[)]
+   SHLIB_SUFFIX_NAME=sl
    SHLIB_DL_SUFFIX_NAME=sl
    ;;
  *darwin*[)]
+   SHLIB_SUFFIX_NAME=dylib
    SHLIB_DL_SUFFIX_NAME=so
    ;;
  esac

diff --git a/configure.in b/configure.in
index b4b376ade3e66ede90df6de3a42354e972dfff0c..98c50b73a29fd5652125d091544ae0530ff56b74 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -224,8 +224,7 @@ dnl -------------------------------------------------------------------------
 
 PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
-PHP_SHLIB_SUFFIX_NAME
-PHP_SHLIB_BUILD_SUFFIX_NAME
+PHP_SHLIB_SUFFIX_NAMES
 PHP_SAPI=default
 PHP_BUILD_PROGRAM
 
@@ -1148,8 +1147,6 @@ PHP_SUBST(SHARED_LIBTOOL)
 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/scripts/phpize.m4 b/scripts/phpize.m4
index de2d3a2f800c6b96d137e819c6572f187a802a23..384d44cd9bb4bc63c6fffe0799367016f96a63ad 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -59,8 +59,7 @@ AC_ARG_WITH(libdir,
 [PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
 
 PHP_RUNPATH_SWITCH
-PHP_SHLIB_SUFFIX_NAME
-PHP_SHLIB_BUILD_SUFFIX_NAME
+PHP_SHLIB_SUFFIX_NAMES
 PHP_WITH_PHP_CONFIG
 
 PHP_BUILD_SHARED