sniper Wed Mar 16 01:36:44 2005 EDT
Modified files:
/php-src configure.in
/php-src/scripts php-config.in
Log:
- Remove these relics from era when TSRM was optional.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.543&r2=1.544&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.543 php-src/configure.in:1.544
--- php-src/configure.in:1.543 Mon Mar 14 16:11:33 2005
+++ php-src/configure.in Wed Mar 16 01:36:42 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.543 2005/03/14 21:11:33 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.544 2005/03/16 06:36:42 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -916,10 +916,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
@@ -1122,8 +1118,6 @@
PHP_SUBST_OLD(PHP_VERSION)
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.2&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.2
--- 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:44 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
