diff options
| author | foobar <sniper@php.net> | 2003-02-13 07:47:21 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-13 07:47:21 +0000 |
| commit | 2f2f6739b41233c5f80b52da932107b29637cf66 (patch) | |
| tree | 1f25adc57774dd674b2c3acfa9c6d04b1a23517a /sapi | |
| parent | 7c989710a82687f9897714a2640159f6c0f511da (diff) | |
| download | php-git-2f2f6739b41233c5f80b52da932107b29637cf66.tar.gz | |
Added HAVE_APACHE define.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/config.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 540c6fc343..85bd89290f 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -79,23 +79,26 @@ AC_ARG_WITH(apxs, STRONGHOLD= AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) + AC_DEFINE(HAVE_APACHE,1,[ ]) AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) ]) -APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module" - if test "$PHP_SAPI" != "apache"; then AC_MSG_CHECKING(for Apache 1.x module support) AC_ARG_WITH(apache, [ --with-apache[=DIR] Build Apache 1.x module. DIR is the top-level Apache build directory, defaults to /usr/local/apache.],[ + + APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module" + if test "$withval" = "yes"; then # Apache's default directory withval=/usr/local/apache fi if test "$withval" != "no"; then + AC_DEFINE(HAVE_APACHE,1,[ ]) APACHE_MODULE=yes PHP_EXPAND_PATH($withval, withval) # For Apache 1.2.x @@ -223,7 +226,6 @@ AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[ 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, |