cvs: /php4 configure.in /php4/ext/pcre config.m4 /php4/sapi/apache config.m4

sas Wed Sep 29 18:18:43 1999 EDT Modified files: /php4 configure.in /php4/ext/pcre config.m4 /php4/sapi/apache config.m4 Log: * create Makefiles for ext, pcrelib, sapi/* * copy files for Apache from $(srcdir) Index: php4/configure.in diff -u php4/configure.in:1.7 php4/configure.in:1.8 --- php4/configure.in:1.7 Wed Sep 29 17:49:32 1999 +++ php4/configure.in Wed Sep 29 18:18:43 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.7 1999/09/29 21:49:32 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.8 1999/09/29 22:18:43 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -706,6 +706,11 @@ # reading config stubs esyscmd(./scripts/config-stubs ext) +dnl if it's still the default choice, enable this implicitly +if test "$PHP_SAPI" = "cgi"; then + PHP_OUTPUT(sapi/cgi/Makefile) +fi + divert(4) dnl If we are using gcc and the user has not specified CFLAGS, add -O2. @@ -741,11 +746,8 @@ AC_SUBST(PHP_SAPI) AC_SUBST(SAPI_TARGET) -test -d sapi || mkdir sapi -test -d ext || mkdir ext - #libphp4.module -AC_OUTPUT([Makefile php4.spec $PHP_OUTPUT_FILES +AC_OUTPUT([Makefile php4.spec ext/Makefile sapi/Makefile $PHP_OUTPUT_FILES scripts/mkextlib regex/Makefile build-defs.h], [], [ if test ! -f $srcdir/ext/bcmath/number.c; then Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.12 php4/ext/pcre/config.m4:1.13 --- php4/ext/pcre/config.m4:1.12 Thu Sep 23 11:37:01 1999 +++ php4/ext/pcre/config.m4 Wed Sep 29 18:18:43 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 1999/09/23 15:37:01 andrey Exp $ +dnl $Id: config.m4,v 1.13 1999/09/29 22:18:43 sas Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -21,6 +21,7 @@ AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) + PHP_OUTPUT(ext/pcre/pcrelib/Makefile) ;; *) if test -f $withval/pcre.h ; then @@ -55,5 +56,6 @@ AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) + PHP_OUTPUT(ext/pcre/pcrelib/Makefile) ]) AC_SUBST(PCRE_SUBDIR) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.2 php4/sapi/apache/config.m4:1.3 --- php4/sapi/apache/config.m4:1.2 Wed Sep 29 11:17:01 1999 +++ php4/sapi/apache/config.m4 Wed Sep 29 18:18:43 1999 @@ -29,12 +29,12 @@ AC_DEFINE(HAVE_AP_CONFIG_H) AC_DEFINE(HAVE_AP_COMPAT_H) AC_MSG_RESULT(yes) + PHP_OUTPUT(sapi/apache/Makefile) ],[ AC_MSG_RESULT(no) ]) -APACHE_INSTALL_FILES="sapi/apache/mod_php4.* sapi/apache/libphp4.module" -PHP_OUTPUT(sapi/apache/libphp4.module) +APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module" if test "$SAPI_TARGET" != "libmodphp4-so.a"; then if test "$SAPI_TARGET" != "libphp4.so"; then @@ -48,6 +48,8 @@ withval=/usr/local/apache fi if test "$withval" != "no"; then + APACHE_MODULE=yes + PHP_OUTPUT(sapi/apache/Makefile) AC_EXPAND_PATH($withval, withval) # For Apache 1.2.x if test -f $withval/src/httpd.h; then @@ -181,6 +183,11 @@ ],[ AC_MSG_RESULT(no) ]) + +if test -n "$APACHE_MODULE"; then + PHP_OUTPUT(sapi/apache/libphp4.module) +fi + dnl ## Local Variables: dnl ## tab-width: 4