cvs: php4(PHP_4_3) /sapi/apache config.m4
| From: | Jani Taskinen | Date: | Mon, 24 Feb 2003 16:16:58 +0000 |
| Subject: | cvs: php4(PHP_4_3) /sapi/apache config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19136@lists.php.net to get a copy of this message | ||
sniper Mon Feb 24 11:16:58 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache config.m4
Log:
MFH: Possible fix for #22259 + part 1/2 for fixing AIX DSO bug
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.62.4.5 php4/sapi/apache/config.m4:1.62.4.6
--- php4/sapi/apache/config.m4:1.62.4.5 Sun Feb 23 02:34:32 2003
+++ php4/sapi/apache/config.m4 Mon Feb 24 11:16:57 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62.4.5 2003/02/23 07:34:32 sniper Exp $
+dnl $Id: config.m4,v 1.62.4.6 2003/02/24 16:16:57 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
@@ -44,25 +44,29 @@
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