summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2006-04-10 12:16:17 +0000
committerfoobar <sniper@php.net>2006-04-10 12:16:17 +0000
commit276171f8715e9b32a26604a2f4aa93a1667cd36d (patch)
tree7ae15a01cd4b811ae72e90b1fa38c36bc5abae32
parent22a8c3113bbd6e4d7015f1bffc8be5d091789566 (diff)
downloadphp-git-276171f8715e9b32a26604a2f4aa93a1667cd36d.tar.gz
MFH: - Determine the shared/link lib suffixes in one macro.
-rw-r--r--acinclude.m431
-rw-r--r--configure.in5
-rw-r--r--scripts/phpize.m43
3 files changed, 11 insertions, 28 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 2f7c71ef92..3f27f6cdce 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1877,40 +1877,27 @@ 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 673b4a31c1..286a3bd2d4 100644
--- 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
@@ -1198,8 +1197,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 de2d3a2f80..384d44cd9b 100644
--- 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