diff options
| author | foobar <sniper@php.net> | 2003-07-08 13:53:34 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-07-08 13:53:34 +0000 |
| commit | 64cad72284e98a94565d7ffa6cf6a590f4d62367 (patch) | |
| tree | 56f071913d08e5e7bdb2544df8e5d2e8d5e26954 /sapi/apache2handler | |
| parent | 79d1a39b48e517dee29f8deb5dd328242b19f963 (diff) | |
| download | php-git-64cad72284e98a94565d7ffa6cf6a590f4d62367.tar.gz | |
- Fixed bug #24537 (apache2 compile missing include directories)
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/config.m4 | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 54e09b3dfb..a69e903625 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -32,16 +32,22 @@ AC_ARG_WITH(apxs2, fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` + APXS_BINDIR=`$APXS -q BINDIR` APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` APXS_CFLAGS=`$APXS -q CFLAGS` APXS_MPM=`$APXS -q MPM_NAME` + APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`" + APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`" + for flag in $APXS_CFLAGS; do case $flag in - -D*) CPPFLAGS="$CPPFLAGS $flag";; + -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";; esac done + APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR" + # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -le 2000000; then @@ -67,7 +73,7 @@ AC_ARG_WITH(apxs2, case $host_alias in *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c php_functions.c) + PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *darwin*) @@ -75,44 +81,41 @@ AC_ARG_WITH(apxs2, dnl the linker does not recursively look at the bundle loader and dnl pull in its dependencies. Therefore, we must pull in the APR dnl and APR-util libraries. - APXS_BINDIR=`$APXS -q BINDIR` - if test -f $APXS_BINDIR/apr-config; then + if test -x "$APXS_BINDIR/apr-config"; then MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`" fi - if test -f $APXS_BINDIR/apu-config; then + if test -x "$APXS_BINDIR/apu-config"; then MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS" fi MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" PHP_SUBST(MH_BUNDLE_FLAGS) - PHP_SELECT_SAPI(apache2handler, bundle, sapi_apache2.c apache_config.c php_functions.c) + PHP_SELECT_SAPI(apache2handler, bundle, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) SAPI_SHARED=libs/libphp5.so INSTALL_IT="$INSTALL_IT $SAPI_SHARED" ;; *beos*) - APXS_BINDIR=`$APXS -q BINDIR` if test -f _APP_; then `rm _APP_`; fi `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS="$EXTRA_LIBS _APP_" - PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c php_functions.c) + PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) - PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c php_functions.c) + PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; esac - PHP_ADD_INCLUDE($APXS_INCLUDEDIR) if test "$APXS_MPM" != "prefork"; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) + + PHP_SUBST(APXS) ],[ AC_MSG_RESULT(no) ]) -PHP_SUBST(APXS) - dnl ## Local Variables: dnl ## tab-width: 4 dnl ## End: |