cvs: /php4 configure.in /php4/sapi/apache config.m4
| From: | Sascha Schumann | Date: | Thu, 30 Sep 1999 12:56:24 +0000 |
| Subject: | cvs: /php4 configure.in /php4/sapi/apache config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-5029@lists.php.net to get a copy of this message | ||
sas Thu Sep 30 08:56:24 1999 EDT
Modified files:
/php4 configure.in
/php4/sapi/apache config.m4
Log:
Automatically add the SAPI target's Makefile to the list. This
frees us from doing this in each config.m4.
Index: php4/configure.in
diff -u php4/configure.in:1.8 php4/configure.in:1.9
--- php4/configure.in:1.8 Wed Sep 29 18:18:43 1999
+++ php4/configure.in Thu Sep 30 08:56:24 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.8 1999/09/29 22:18:43 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.9 1999/09/30 12:56:24 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(0)
@@ -706,10 +706,7 @@
# 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
+PHP_OUTPUT(sapi/$PHP_SAPI/Makefile)
divert(4)
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.3 php4/sapi/apache/config.m4:1.4
--- php4/sapi/apache/config.m4:1.3 Wed Sep 29 18:18:43 1999
+++ php4/sapi/apache/config.m4 Thu Sep 30 08:56:24 1999
@@ -29,7 +29,6 @@
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)
])
@@ -49,7 +48,6 @@
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