diff options
| author | Sascha Schumann <sas@php.net> | 2003-03-30 18:36:04 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2003-03-30 18:36:04 +0000 |
| commit | d26e1b751c89b5d664cc656516970fdc16d1ca4a (patch) | |
| tree | 1571b81380c59b528f2ccd0d3541a6098ebd9523 | |
| parent | 6e3faef231f58d073d04369921dd628308cc8a81 (diff) | |
| download | php-git-d26e1b751c89b5d664cc656516970fdc16d1ca4a.tar.gz | |
Merge proper -I parameter for APXS builds
| -rw-r--r-- | sapi/apache/config.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index f0eeb4bae5..2d95309f61 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -234,7 +234,11 @@ PHP_SUBST(STRONGHOLD) 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 |