diff options
| author | foobar <sniper@php.net> | 2003-02-24 16:16:11 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-24 16:16:11 +0000 |
| commit | 73bae37f26c920e608f33bd369a42ad849e624ad (patch) | |
| tree | f77549f5bef4764b60f3b705d72fb65085b6b560 | |
| parent | 171fd9384056eeaf2248dd2f303dd2d42277481f (diff) | |
| download | php-git-73bae37f26c920e608f33bd369a42ad849e624ad.tar.gz | |
Possible fix for #22259 + part 1/2 for fixing one AIX bug..
| -rw-r--r-- | sapi/apache/config.m4 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 9b952785d1..9fb54cf033 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -44,26 +44,30 @@ AC_ARG_WITH(apxs, for flag in $APXS_CFLAGS; do case $flag in - -D*) CPPFLAGS="$CPPFLAGS $flag";; + -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";; esac done + case $host_alias in *aix*) APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR) + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_AIX_LDFLAGS="-Wl,-brtl" + build_type=shared ;; *darwin*) MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" PHP_SUBST(MH_BUNDLE_FLAGS) SAPI_SHARED=libs/libphp4.so - PHP_SELECT_SAPI(apache, bundle, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR) + build_type=bundle ;; *) - PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR) + build_type=shared ;; esac + PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php4.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR) + # Test whether apxs support -S option $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 |