jani Tue Jul 10 10:18:26 2007 UTC
Modified files:
/php-src acinclude.m4 configure.in
Log:
- Removed --enable-versioning
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.370&r2=1.371&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.370 php-src/acinclude.m4:1.371
--- php-src/acinclude.m4:1.370 Fri Jun 29 01:09:53 2007
+++ php-src/acinclude.m4 Tue Jul 10 10:18:26 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.370 2007/06/29 01:09:53 sniper Exp $
+dnl $Id: acinclude.m4,v 1.371 2007/07/10 10:18:26 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -746,16 +746,6 @@
dnl -------------------------------------------------------------------------
dnl
-dnl PHP_SET_SYM_FILE(path)
-dnl
-dnl set the path of the file which contains the symbol export list
-dnl
-AC_DEFUN([PHP_SET_SYM_FILE],
-[
- PHP_SYM_FILE=$1
-])
-
-dnl
dnl PHP_BUILD_THREAD_SAFE
dnl
AC_DEFUN([PHP_BUILD_THREAD_SAFE],[
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.632&r2=1.633&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.632 php-src/configure.in:1.633
--- php-src/configure.in:1.632 Fri Jul 6 10:58:36 2007
+++ php-src/configure.in Tue Jul 10 10:18:26 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.632 2007/07/06 10:58:36 tony2001 Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.633 2007/07/10 10:18:26 jani Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -809,16 +809,6 @@
AC_MSG_RESULT(using system default)
])
-AC_MSG_CHECKING([whether to enable versioning])
-AC_ARG_ENABLE(versioning,
-[ --enable-versioning Export only required symbols.
- See INSTALL for more information], [
- PHP_VERSIONING=$enableval
-],[
- PHP_VERSIONING=no
-])
-AC_MSG_RESULT([$PHP_VERSIONING])
-
dnl ## check for ICU library location and version
PHP_SETUP_ICU
@@ -860,23 +850,6 @@
dnl Extensions post-config
dnl -------------------------------------------------------------------------
-if test "$PHP_VERSIONING" = "yes"; then
- if test -n "$PHP_MODULES"; then
- AC_MSG_ERROR([--enable-versioning cannot be used with shared modules])
- fi
-
- case $host_alias in
- *darwin*)
- AC_MSG_ERROR([--enable-versioning is not supported on your platform])
- ;;
- esac
-
- test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
- if test -f "$PHP_SYM_FILE"; then
- EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS"
- fi
-fi
-
enable_shared=yes
enable_static=yes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php