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/servlet | |
| 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/servlet')
| -rw-r--r-- | sapi/servlet/Makefile.in (renamed from sapi/servlet/Makefile.am) | 17 | ||||
| -rw-r--r-- | sapi/servlet/config.m4 | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sapi/servlet/Makefile.am b/sapi/servlet/Makefile.in index 11103e5541..d0fd7a29b2 100644 --- a/sapi/servlet/Makefile.am +++ b/sapi/servlet/Makefile.in @@ -1,11 +1,16 @@ -# $Id$ -SRC=servlet.c java.c +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=libphpsapi_servlet.la -libphpsapi_servlet_la_SOURCES=$(SRC) +LTLIBRARY_NAME = libsapi.la +LTLIBRARY_SOURCES = servlet.c java.c + +include $(topsrcdir)/build/ltlib.mk + +CFLAGS += $(JAVA_CFLAGS) +INCLUDES += $(JAVA_INCLUDE) java.c : ../../ext/java/java.c @cp ../../ext/java/java.c . diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4 index 28c3ed1ba2..3259fe86d6 100644 --- a/sapi/servlet/config.m4 +++ b/sapi/servlet/config.m4 @@ -37,4 +37,4 @@ AC_ARG_WITH(servlet, AC_MSG_RESULT(no) ]) -AC_SUBST(SERVLET_CLASSPATH) +PHP_SUBST(SERVLET_CLASSPATH) |