diff options
| author | Sascha Schumann <sas@php.net> | 2001-04-09 15:47:19 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-04-09 15:47:19 +0000 |
| commit | 466c226415405a462af2ee61bbe46ea1eebea80c (patch) | |
| tree | dcbb25dc28cc76d2b73a7aadf9cba7aed0b730cd /sapi | |
| parent | d85be2956ce1bec342e18772993634468232a9dc (diff) | |
| download | php-git-466c226415405a462af2ee61bbe46ea1eebea80c.tar.gz | |
Revert mega patch.
This patch has at least the following deficiences:
- the CGI is built using objects from another SAPI module.
This usually results in unsatisfied symbol references.
- the CGI makefile is not created properly
- building CGI cannot be disabled
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/Makefile.in | 2 | ||||
| -rw-r--r-- | sapi/cgi/config.m4 | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sapi/Makefile.in b/sapi/Makefile.in index 45658a2fe1..089a1e4a65 100644 --- a/sapi/Makefile.in +++ b/sapi/Makefile.in @@ -1,4 +1,4 @@ -SUBDIRS = $(CGI_DIR) $(PHP_SAPI) +SUBDIRS = $(PHP_SAPI) include $(top_srcdir)/build/rules.mk diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4 index e4cc3d5912..9c1ea3acc5 100644 --- a/sapi/cgi/config.m4 +++ b/sapi/cgi/config.m4 @@ -29,18 +29,9 @@ if test "$PHP_SAPI" = "cgi"; then fi -# Always build and install the CGI binary -INSTALL_CGI="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI" if test "$PHP_SAPI" = "cgi" ; then - CGI_DIR="" - CGI_LDADD="" - INSTALL_IT="" -else - CGI_DIR="cgi" - CGI_LDADD="sapi/cgi/libsapi.la" + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI" fi -PHP_SUBST(CGI_DIR) -PHP_SUBST(CGI_LDADD) AC_MSG_CHECKING(for fhttpd module support) AC_ARG_WITH(fhttpd, |