cvs: php-src / acinclude.m4 configure.in /scripts phpize.m4

sniper Mon Apr 10 12:16:08 2006 UTC Modified files: /php-src acinclude.m4 configure.in /php-src/scripts phpize.m4 Log: - Determine the shared/link lib suffixes in one macro. http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.343&r2=1.344&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.343 php-src/acinclude.m4:1.344 --- php-src/acinclude.m4:1.343 Sat Apr 8 17:34:57 2006 +++ php-src/acinclude.m4 Mon Apr 10 12:16:08 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.343 2006/04/08 17:34:57 andrei Exp $ +dnl $Id: acinclude.m4,v 1.344 2006/04/10 12:16:08 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1877,40 +1877,27 @@ 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 http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.602&r2=1.603&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.602 php-src/configure.in:1.603 --- php-src/configure.in:1.602 Sat Apr 8 17:34:57 2006 +++ php-src/configure.in Mon Apr 10 12:16:08 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.602 2006/04/08 17:34:57 andrei Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.603 2006/04/10 12:16:08 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -224,8 +224,7 @@ 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(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 http://cvs.php.net/viewcvs.cgi/php-src/scripts/phpize.m4?r1=1.19&r2=1.20&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.19 php-src/scripts/phpize.m4:1.20 --- php-src/scripts/phpize.m4:1.19 Sat Apr 8 17:34:57 2006 +++ php-src/scripts/phpize.m4 Mon Apr 10 12:16:08 2006 @@ -59,8 +59,7 @@ [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