andrei Sat Apr 8 17:34:57 2006 UTC
Modified files:
/php-src Makefile.global acinclude.m4 configure.in
/php-src/main build-defs.h.in
/php-src/scripts phpize.m4
Log:
Separate suffixes of shared libraries that we link against and the ones
we load with dlopen(). This matters on Mac OS X, for example.
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.global?r1=1.68&r2=1.69&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.68 php-src/Makefile.global:1.69
--- php-src/Makefile.global:1.68 Wed Apr 5 20:21:59 2006
+++ php-src/Makefile.global Sat Apr 8 17:34:57 2006
@@ -25,10 +25,10 @@
install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module: $(PHP_SAPI)"
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME);
then \
+ [EMAIL PROTECTED] 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; \
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.342&r2=1.343&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.342 php-src/acinclude.m4:1.343
--- php-src/acinclude.m4:1.342 Mon Mar 27 05:01:48 2006
+++ php-src/acinclude.m4 Sat Apr 8 17:34:57 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.342 2006/03/27 05:01:48 andrei Exp $
+dnl $Id: acinclude.m4,v 1.343 2006/04/08 17:34:57 andrei Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -1877,20 +1877,43 @@
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
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.601&r2=1.602&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.601 php-src/configure.in:1.602
--- php-src/configure.in:1.601 Wed Mar 29 01:52:28 2006
+++ php-src/configure.in Sat Apr 8 17:34:57 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.601 2006/03/29 01:52:28 pollita Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.602 2006/04/08 17:34:57 andrei Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -225,6 +225,7 @@
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 -------------------------------------------------------------------------
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(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/main/build-defs.h.in?r1=1.17&r2=1.18&diff_format=u
Index: php-src/main/build-defs.h.in
diff -u php-src/main/build-defs.h.in:1.17 php-src/main/build-defs.h.in:1.18
--- php-src/main/build-defs.h.in:1.17 Sun Jan 1 13:09:57 2006
+++ php-src/main/build-defs.h.in Sat Apr 8 17:34:57 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: build-defs.h.in,v 1.17 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: build-defs.h.in,v 1.18 2006/04/08 17:34:57 andrei Exp $ */
#define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
#define PHP_ADA_INCLUDE ""
@@ -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@"
http://cvs.php.net/viewcvs.cgi/php-src/scripts/phpize.m4?r1=1.18&r2=1.19&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.18 php-src/scripts/phpize.m4:1.19
--- php-src/scripts/phpize.m4:1.18 Mon Nov 21 23:07:36 2005
+++ php-src/scripts/phpize.m4 Sat Apr 8 17:34:57 2006
@@ -60,6 +60,7 @@
PHP_RUNPATH_SWITCH
PHP_SHLIB_SUFFIX_NAME
+PHP_SHLIB_BUILD_SUFFIX_NAME
PHP_WITH_PHP_CONFIG
PHP_BUILD_SHARED
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
