From: foobar <sniper@php.net>
Date: Tue, 23 Apr 2002 02:51:17 +0000 (+0000)
Subject: Part 2 of static apache build fixes:
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~488
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50f91c18fb2002e66d3e1fb603320a0ce1d43ade;p=php

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 181ac8411e..8b05e3a8f5 100644
--- 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)