cvs: /php4/sapi/apache config.m4

rbb Mon Dec 27 18:43:18 1999 EDT Modified files: /php4/sapi/apache config.m4 Log: Beginning work to get PHP 4 to work with Apache 2.0. This change detects Apache 2.0 properly. # This is extremely experimental because neither project is release # quality yet. I expect this to drive bugs out of Apache 2.0's configure # process as well as provide a useful version of PHP for Apache 2.0, so it # may take some time for this to become stable. I will commit changes to # PHP as needed although more modifications will be on the Apache side. Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.15 php4/sapi/apache/config.m4:1.16 --- php4/sapi/apache/config.m4:1.15 Fri Dec 24 10:56:40 1999 +++ php4/sapi/apache/config.m4 Mon Dec 27 18:42:46 1999 @@ -73,6 +73,34 @@ if test -f $withval/src/ap_config.h; then AC_DEFINE(HAVE_AP_CONFIG_H) fi + # For Apache 2.0.x + elif test -f $withval/src/include/httpd.h && + test -f $withval/src/lib/apr/include/apr_general.h ; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix -I$withval/src/lib/apr/include" + APACHE_TARGET=$withval/src/modules/php4 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi + PHP_SAPI=apache + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" + AC_DEFINE(APACHE) + AC_MSG_RESULT(yes - Apache 2.0.X) + STRONGHOLD= + if test -f $withval/src/include/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H) + fi + if test -f $withval/src/include/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H) + if test ! -f $withval/src/include/ap_config_auto.h; then + AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) + fi + else + if test -f $withval/src/include/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H) + fi + fi # For Apache 1.3.x elif test -f $withval/src/main/httpd.h; then APACHE_HAS_REGEX=1