summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2007-07-10 10:18:48 +0000
committerJani Taskinen <jani@php.net>2007-07-10 10:18:48 +0000
commitb0ef04af84a0a2958b84d35865991be99b4d6a26 (patch)
tree0246d985f0343380b4a380b1bd9f2c6619c09d9b
parentc5254dbc1d169b1ba1d73885ca3eacd124113576 (diff)
downloadphp-git-b0ef04af84a0a2958b84d35865991be99b4d6a26.tar.gz
MFH: Removed --enable-versioning
-rw-r--r--NEWS2
-rw-r--r--acinclude.m410
-rw-r--r--configure.in27
3 files changed, 2 insertions, 37 deletions
diff --git a/NEWS b/NEWS
index 0200a4a7af..fb463ce0ed 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/acinclude.m4 b/acinclude.m4
index 8d59cb476d..151da37172 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -746,16 +746,6 @@ dnl Build macros
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],[
diff --git a/configure.in b/configure.in
index 623f4c8680..8e88952db3 100644
--- a/configure.in
+++ b/configure.in
@@ -852,16 +852,6 @@ AC_ARG_ENABLE(fd-setsize,
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 @@ esyscmd(./build/config-stubs ext)
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