cvs: php-src(PHP_5_0) / configure.in /scripts php-config.in
| From: | Jani Taskinen | Date: | Wed, 16 Mar 2005 06:36:54 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / configure.in /scripts php-config.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30947@lists.php.net to get a copy of this message | ||
sniper Wed Mar 16 01:36:54 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src configure.in
/php-src/scripts php-config.in
Log:
MFH: - Remove these relics from era when TSRM was optional.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.40&r2=1.514.2.41&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.40 php-src/configure.in:1.514.2.41
--- php-src/configure.in:1.514.2.40 Mon Mar 14 16:12:26 2005
+++ php-src/configure.in Wed Mar 16 01:36:53 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.40 2005/03/14 21:12:26 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.41 2005/03/16 06:36:53 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -973,10 +973,6 @@
LIBZEND_DLSYM_CHECK
LIBZEND_OTHER_CHECKS
-TSRM_LIB='TSRM/libtsrm.la'
-TSRM_DIR=TSRM
-CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM"
-
if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
AC_DEFINE(ZTS,1,[ ])
PHP_THREAD_SAFETY=yes
@@ -1185,8 +1181,6 @@
PHP_SUBST(RE2C)
PHP_SUBST(SHELL)
PHP_SUBST(SHARED_LIBTOOL)
-PHP_SUBST(TSRM_DIR)
-PHP_SUBST(TSRM_LIB)
PHP_SUBST(WARNING_LEVEL)
PHP_SUBST(PHP_FRAMEWORKS)
PHP_SUBST(PHP_FRAMEWORKPATH)
http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.1&r2=1.1.4.1&ty=u
Index: php-src/scripts/php-config.in
diff -u php-src/scripts/php-config.in:1.1 php-src/scripts/php-config.in:1.1.4.1
--- php-src/scripts/php-config.in:1.1 Tue Jan 28 05:59:11 2003
+++ php-src/scripts/php-config.in Wed Mar 16 01:36:54 2005
@@ -3,12 +3,9 @@
prefix="@prefix@"
version="@PHP_VERSION@"
includedir="@includedir@/php"
-includes="-I$includedir -I$includedir/main -I$includedir/Zend"
+includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
-if test '@TSRM_DIR@' != ''; then
- includes="$includes -I$includedir/TSRM"
-fi
extension_dir='@EXTENSION_DIR@'
case "$1" in