sniper Thu Mar 17 03:12:15 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src configure.in
Log:
fix build
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.41&r2=1.514.2.42&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.41 php-src/configure.in:1.514.2.42
--- php-src/configure.in:1.514.2.41 Wed Mar 16 01:36:53 2005
+++ php-src/configure.in Thu Mar 17 03:12:14 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.41 2005/03/16 06:36:53 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.514.2.42 2005/03/17 08:12:14 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -308,7 +308,6 @@
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
fi
-INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)
@@ -980,6 +979,9 @@
PHP_THREAD_SAFETY=no
fi
+INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
+INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
+
if test "$abs_srcdir" != "$abs_builddir"; then
INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/"
@@ -1152,7 +1154,6 @@
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST(CXX_PHP_COMPILE)
PHP_SUBST_OLD(DEBUG_CFLAGS)
-PHP_SUBST(DEFS)
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php