diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-30 02:59:53 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-30 02:59:53 +0000 |
| commit | f2f8d38efa3ccbaa05affaf8fcab24786ef452de (patch) | |
| tree | c546807d61a77a191f89056212a4c40c63f0e83b /sapi/phttpd | |
| parent | 6bf3529919cf60389797a107cab16c826df3e68f (diff) | |
| download | php-git-f2f8d38efa3ccbaa05affaf8fcab24786ef452de.tar.gz | |
Integration of -ng changes. Changes:
- added support for externally built modules,
- improved support for in-tree shared modules,
- fixed diversion bugs,
- configure displays some informative messages,
- faster static build
(libtool isn't used anymore for compiling non-PIC objects),
- dependencies comparable to automake's without requiring GNU make or GCC,
- working make clean for non-GNU makes.
Diffstat (limited to 'sapi/phttpd')
| -rw-r--r-- | sapi/phttpd/Makefile.am | 2 | ||||
| -rw-r--r-- | sapi/phttpd/Makefile.in | 10 | ||||
| -rw-r--r-- | sapi/phttpd/config.m4 | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sapi/phttpd/Makefile.am b/sapi/phttpd/Makefile.am deleted file mode 100644 index 6430c64bc5..0000000000 --- a/sapi/phttpd/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -noinst_LTLIBRARIES=libphpsapi_phttpd.la -libphpsapi_phttpd_la_SOURCES=phttpd.c diff --git a/sapi/phttpd/Makefile.in b/sapi/phttpd/Makefile.in new file mode 100644 index 0000000000..ab0413fad0 --- /dev/null +++ b/sapi/phttpd/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsapi.la +LTLIBRARY_SOURCES = phttpd.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4 index 21dbe1fb31..10460b84e0 100644 --- a/sapi/phttpd/config.m4 +++ b/sapi/phttpd/config.m4 @@ -14,7 +14,7 @@ AC_ARG_WITH(phttpd, AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd]) PHP_SAPI=phttpd PHP_BUILD_SHARED - INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/" + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/" RESULT=yes ]) AC_MSG_RESULT($RESULT) |