sniper Fri Mar 4 10:16:27 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache config.m4
/php-src/scripts phpize.m4
Log:
MFH
http://cvs.php.net/diff.php/php-src/sapi/apache/config.m4?r1=1.62.4.10&r2=1.62.4.11&ty=u
Index: php-src/sapi/apache/config.m4
diff -u php-src/sapi/apache/config.m4:1.62.4.10
php-src/sapi/apache/config.m4:1.62.4.11
--- php-src/sapi/apache/config.m4:1.62.4.10 Wed Jan 26 13:03:30 2005
+++ php-src/sapi/apache/config.m4 Fri Mar 4 10:16:27 2005
@@ -1,6 +1,22 @@
dnl
-dnl $Id: config.m4,v 1.62.4.10 2005/01/26 18:03:30 derick Exp $
+dnl $Id: config.m4,v 1.62.4.11 2005/03/04 15:16:27 sniper Exp $
dnl
+AC_DEFUN([PHP_APACHE_FD_CHECK], [
+AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
+ save=$CPPFLAGS
+ 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
+])
+if test "$ac_cv_php_fd_in_buff" = "yes"; then
+ AC_DEFINE(PHP_APACHE_HAVE_CLIENT_FD,1,[ ])
+fi
+])
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
AC_ARG_WITH(apxs,
@@ -220,33 +236,6 @@
fi
-if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
- APXS_EXP=-bE:sapi/apache/mod_php4.exp
-fi
-
-PHP_SUBST(APXS_EXP)
-PHP_SUBST(APACHE_INCLUDE)
-PHP_SUBST(APACHE_TARGET)
-PHP_SUBST(APXS)
-PHP_SUBST(APXS_LDFLAGS)
-PHP_SUBST(APACHE_INSTALL)
-PHP_SUBST(STRONGHOLD)
-
-AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
- save=$CPPFLAGS
- 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
-])
-if test "$ac_cv_php_fd_in_buff" = "yes"; then
- AC_DEFINE(PHP_APACHE_HAVE_CLIENT_FD,1,[ ])
-fi
-
AC_MSG_CHECKING(for mod_charset compatibility option)
AC_ARG_WITH(mod_charset,
[ --with-mod_charset Enable transfer tables for mod_charset (Rus
Apache).],
@@ -257,14 +246,29 @@
AC_MSG_RESULT(no)
])
+dnl Build as static module
if test -n "$APACHE_MODULE"; then
PHP_TARGET_RDYNAMIC
$php_shtool mkdir -p sapi/apache
PHP_OUTPUT(sapi/apache/libphp4.module)
fi
+dnl General
if test -n "$APACHE_INSTALL"; then
+ if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
+ APXS_EXP=-bE:sapi/apache/mod_php4.exp
+ fi
+
+ PHP_APACHE_FD_CHECK
INSTALL_IT=$APACHE_INSTALL
+
+ PHP_SUBST(APXS_EXP)
+ PHP_SUBST(APACHE_INCLUDE)
+ PHP_SUBST(APACHE_TARGET)
+ PHP_SUBST(APXS)
+ PHP_SUBST(APXS_LDFLAGS)
+ PHP_SUBST(APACHE_INSTALL)
+ PHP_SUBST(STRONGHOLD)
fi
dnl ## Local Variables:
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.1.2.9&r2=1.1.2.10&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.1.2.9 php-src/scripts/phpize.m4:1.1.2.10
--- php-src/scripts/phpize.m4:1.1.2.9 Fri Jan 7 01:21:42 2005
+++ php-src/scripts/phpize.m4 Fri Mar 4 10:16:27 2005
@@ -88,6 +88,7 @@
PHP_SUBST(CPP)
PHP_SUBST(CPPFLAGS)
PHP_SUBST(CXX)
+PHP_SUBST(CXXFLAGS)
PHP_SUBST(DEFS)
PHP_SUBST(EXTENSION_DIR)
PHP_SUBST(EXTRA_LDFLAGS)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
