jani            Tue Jul 10 10:18:48 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS acinclude.m4 configure.in 
  Log:
  MFH: Removed --enable-versioning
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.822&r2=1.2027.2.547.2.823&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.822 php-src/NEWS:1.2027.2.547.2.823
--- php-src/NEWS:1.2027.2.547.2.822     Mon Jul  9 12:55:50 2007
+++ php-src/NEWS        Tue Jul 10 10:18:48 2007
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2007, PHP 5.2.4
+- Removed --enable-versioning configure option. (Jani)
+
 - Upgraded PCRE to version 7.2 (Nuno)
 - Updated timezone database to version 2007.6. (Derick)
 
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.17&r2=1.332.2.14.2.18&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.17 
php-src/acinclude.m4:1.332.2.14.2.18
--- php-src/acinclude.m4:1.332.2.14.2.17        Fri Jun 29 01:10:35 2007
+++ php-src/acinclude.m4        Tue Jul 10 10:18:48 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.17 2007/06/29 01:10:35 sniper Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.18 2007/07/10 10:18:48 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.579.2.52.2.62&r2=1.579.2.52.2.63&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.62 
php-src/configure.in:1.579.2.52.2.63
--- php-src/configure.in:1.579.2.52.2.62        Fri Jul  6 10:44:23 2007
+++ php-src/configure.in        Tue Jul 10 10:18:48 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.62 2007/07/06 10:44:23 tony2001 Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.63 2007/07/10 10:18:48 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -852,16 +852,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])
-
 divert(5)
 
 dnl ## In diversion 5 we check which extensions should be compiled.
@@ -900,23 +890,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

Reply via email to