Part 2 of static apache build fixes:

- Added 2 variables to be used in libphp4.module
  o Apparently autoconf 2.53 screws abs_srcdir
- Made INCLUDES and EXTRA_INCLUDES available to be used with AC_OUTPUT()
  o Not related to the static apache build issues

diff --git a/configure.in b/configure.in
index 181ac8411eafb8a8310b26aa8acbfde8ece20137..8b05e3a8f559538ba727367a6663c185bec0b9a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -136,6 +136,9 @@ AC_AIX
 abs_srcdir=`(cd $srcdir; pwd)`
 abs_builddir=`pwd`
 
+php_abs_top_srcdir=`(cd $srcdir; pwd)`
+php_abs_top_builddir=`pwd`
+
 dnl Because ``make install'' is often performed by the superuser,
 dnl we create the libs subdirectory as the user who configures PHP.
 dnl Otherwise, the current user will not be able to delete libs
@@ -977,6 +980,9 @@ PHP_SUBST(EXT_LIBS)
 
 PHP_SUBST_OLD(abs_builddir)
 PHP_SUBST_OLD(abs_srcdir)
+PHP_SUBST_OLD(php_abs_top_builddir)
+PHP_SUBST_OLD(php_abs_top_srcdir)
+
 PHP_SUBST(bindir)
 PHP_SUBST(exec_prefix)
 PHP_SUBST(includedir)
@@ -1005,7 +1011,8 @@ PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LIBS)
 PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
-PHP_SUBST(INCLUDES)
+PHP_SUBST_OLD(INCLUDES)
+PHP_SUBST_OLD(EXTRA_INCLUDES)
 PHP_SUBST_OLD(INCLUDE_PATH)
 PHP_SUBST_OLD(INSTALL_IT)
 PHP_SUBST(LEX)