Merge proper -I parameter for APXS builds

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index f0eeb4bae5053f33993046c16596fa3302c5d9e7..2d95309f6190cc8123a89f5f0f41102624878c8f 100644 (file)
--- 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