sas Sun Mar 30 13:36:04 2003 EDT
Modified files:
/php4/sapi/apache config.m4
Log:
Merge proper -I parameter for APXS builds
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.69 php4/sapi/apache/config.m4:1.70
--- php4/sapi/apache/config.m4:1.69 Fri Mar 28 23:52:46 2003
+++ php4/sapi/apache/config.m4 Sun Mar 30 13:36:04 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69 2003/03/29 04:52:46 sterling Exp $
+dnl $Id: config.m4,v 1.70 2003/03/30 18:36:04 sas Exp $
dnl
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
@@ -234,7 +234,11 @@
AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
save=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
+ if test -n "$APXS_INCLUDEDIR"; then
+ CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR"
+ else
+ CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
+ fi
AC_TRY_COMPILE([#include <httpd.h>],[conn_rec *c; int fd = c->client->fd;],[
ac_cv_php_fd_in_buff=yes],[ac_cv_php_fd_in_buff=no],[ac_cv_php_fd_in_buff=no])
CPPFLAGS=$save
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
