sniper Mon Apr 10 12:16:17 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src acinclude.m4 configure.in
/php-src/scripts phpize.m4
Log:
MFH: - Determine the shared/link lib suffixes in one macro.
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.332.2.12&r2=1.332.2.13&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.12 php-src/acinclude.m4:1.332.2.13
--- php-src/acinclude.m4:1.332.2.12 Sat Apr 8 17:53:11 2006
+++ php-src/acinclude.m4 Mon Apr 10 12:16:17 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.12 2006/04/08 17:53:11 andrei Exp $
+dnl $Id: acinclude.m4,v 1.332.2.13 2006/04/10 12:16:17 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.579.2.44&r2=1.579.2.45&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.44 php-src/configure.in:1.579.2.45
--- php-src/configure.in:1.579.2.44 Sat Apr 8 17:53:11 2006
+++ php-src/configure.in Mon Apr 10 12:16:17 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.44 2006/04/08 17:53:11 andrei Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.45 2006/04/10 12:16:17 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
@@ -1198,8 +1197,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.17.2.2&r2=1.17.2.3&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.2 php-src/scripts/phpize.m4:1.17.2.3
--- php-src/scripts/phpize.m4:1.17.2.2 Sat Apr 8 17:53:11 2006
+++ php-src/scripts/phpize.m4 Mon Apr 10 12:16:17 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
