From: foobar <sniper@php.net>
Date: Wed, 16 Mar 2005 06:37:03 +0000 (+0000)
Subject: MFH: - Remove these relics from era when TSRM was optional.
X-Git-Tag: php-4.3.11RC2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b012f72445b97745d5d9ab9a66e4440479409fe;p=php

MFH: - Remove these relics from era when TSRM was optional.
---

diff --git a/configure.in b/configure.in
index 4eedb7ba03..dbf42365ff 100644
--- a/configure.in
+++ b/configure.in
@@ -935,10 +935,6 @@ LIBZEND_BASIC_CHECKS
 LIBZEND_DLSYM_CHECK
 LIBZEND_OTHER_CHECKS
 
-TSRM_LIB='TSRM/libtsrm.la'
-TSRM_DIR=TSRM
-CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM"
-
 if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   PHP_THREAD_SAFETY=yes
@@ -1147,8 +1143,6 @@ PHP_SUBST(PROG_SENDMAIL)
 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)
diff --git a/scripts/php-config.in b/scripts/php-config.in
index abdab2ce0e..a3105dff4d 100644
--- a/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -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