cvs: /php4 configure.in

sas Mon Dec 20 21:35:08 1999 EDT Modified files: /php4 configure.in Log: Only add additional include paths, if building in a separate directory (cosmetic change) Index: php4/configure.in diff -u php4/configure.in:1.74 php4/configure.in:1.75 --- php4/configure.in:1.74 Mon Dec 20 19:15:51 1999 +++ php4/configure.in Mon Dec 20 21:35:07 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.74 1999/12/21 00:15:51 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.75 1999/12/21 02:35:07 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -156,7 +156,7 @@ LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi -INCLUDES="-I\$(top_builddir)/Zend -I\$(top_srcdir) -I\$(top_srcdir)/Zend" +INCLUDES="-I\$(top_builddir)/Zend -I\$(top_srcdir)" AC_SUBST(INCLUDES) AC_CHECK_LIB(nsl, gethostname, [ @@ -697,11 +697,18 @@ TSRM_LIB='TSRM/libtsrm.la' TSRM_DIR=TSRM AC_DEFINE(ZTS) - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM -I\$(top_srcdir)/TSRM" + INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" PHP_THREAD_SAFETY=yes PHP_OUTPUT(TSRM/Makefile) else PHP_THREAD_SAFETY=no +fi + +if test "$abs_srcdir" != "$abs_builddir"; then + INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend" + if test "$PHP_THREAD_SAFETY" = "yes"; then + INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" + fi fi AC_SUBST(TSRM_DIR)