- Remove these relics from era when TSRM was optional.

diff --git a/configure.in b/configure.in
index 18d9f1a8ebb5332213ebfedfee84bccd90375d17..80bcf0e139050e72a1fa55ff144b2f8a03ff4821 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -916,10 +916,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_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   PHP_THREAD_SAFETY=yes
@@ -1122,8 +1118,6 @@ PHP_SUBST(PHP_SAPI)
 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)

diff --git a/scripts/php-config.in b/scripts/php-config.in
index abdab2ce0e581653955e3bc7612fd2d727af095f..a3105dff4d8d72b97d23aa979ddde48febc20e65 100644 (file)
--- 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