diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-30 12:56:24 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-30 12:56:24 +0000 |
| commit | 5320c897f53c7e699f586aaa2d60606b791e9fd3 (patch) | |
| tree | 5beb75310bcbad5cc954b9d712e055840337ea80 | |
| parent | 16e1cbee079a15a9fa6f610d8d095e72511b9338 (diff) | |
| download | php-git-5320c897f53c7e699f586aaa2d60606b791e9fd3.tar.gz | |
Automatically add the SAPI target's Makefile to the list. This
frees us from doing this in each config.m4.
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | sapi/apache/config.m4 | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 9f4883bf39..c2a97df581 100644 --- a/configure.in +++ b/configure.in @@ -706,10 +706,7 @@ AC_SUBST(EXTRA_LIBS) # 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) diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 4265f7f35c..2a1e66298c 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -29,7 +29,6 @@ AC_ARG_WITH(apxs, 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 @@ AC_ARG_WITH(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 |