cvs: php4 / configure.in
| From: | Jani Taskinen | Date: | Tue, 23 Apr 2002 02:51:17 +0000 |
| Subject: | cvs: php4 / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11322@lists.php.net to get a copy of this message | ||
sniper Mon Apr 22 22:51:17 2002 EDT
Modified files:
/php4 configure.in
Log:
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
Index: php4/configure.in
diff -u php4/configure.in:1.337 php4/configure.in:1.338
--- php4/configure.in:1.337 Thu Apr 11 11:15:33 2002
+++ php4/configure.in Mon Apr 22 22:51:17 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.337 2002/04/11 15:15:33 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.338 2002/04/23 02:51:17 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -136,6 +136,9 @@
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_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(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)