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/apache | |
| 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/apache')
| -rw-r--r-- | sapi/apache/Makefile.am | 5 | ||||
| -rw-r--r-- | sapi/apache/Makefile.in | 12 | ||||
| -rw-r--r-- | sapi/apache/config.m4 | 18 |
3 files changed, 21 insertions, 14 deletions
diff --git a/sapi/apache/Makefile.am b/sapi/apache/Makefile.am deleted file mode 100644 index ba36956a5f..0000000000 --- a/sapi/apache/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -APACHE_INCLUDE=@APACHE_INCLUDE@ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend $(APACHE_INCLUDE) -noinst_LTLIBRARIES=libphpsapi_apache.la -libphpsapi_apache_la_SOURCES=sapi_apache.c mod_php4.c diff --git a/sapi/apache/Makefile.in b/sapi/apache/Makefile.in new file mode 100644 index 0000000000..e591d4a8bb --- /dev/null +++ b/sapi/apache/Makefile.in @@ -0,0 +1,12 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsapi.la +LTLIBRARY_SOURCES = sapi_apache.c mod_php4.c + +include $(topsrcdir)/build/ltlib.mk + +INCLUDES += $(APACHE_INCLUDE) diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 4f1a65b2c9..a9c26ee3bd 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -193,20 +193,20 @@ AC_ARG_WITH(apache, ]) INCLUDES="$INCLUDES $APACHE_INCLUDE" -dnl## AC_SUBST(APACHE_INCLUDE) +dnl## PHP_SUBST(APACHE_INCLUDE) fi if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then APXS_EXP="-bE:sapi/apache/mod_php4.exp" fi -AC_SUBST(APXS_EXP) -AC_SUBST(APACHE_INCLUDE) -AC_SUBST(APACHE_TARGET) -AC_SUBST(APXS) -AC_SUBST(APXS_LDFLAGS) -AC_SUBST(APACHE_INSTALL) -AC_SUBST(STRONGHOLD) +PHP_SUBST(APXS_EXP) +PHP_SUBST(APACHE_INCLUDE) +PHP_SUBST(APACHE_TARGET) +PHP_SUBST(APXS) +PHP_SUBST(APXS_LDFLAGS) +PHP_SUBST(APACHE_INSTALL) +PHP_SUBST(STRONGHOLD) AC_MSG_CHECKING(for mod_charset compatibility option) AC_ARG_WITH(mod_charset, @@ -232,7 +232,7 @@ if test -n "$APACHE_MODULE"; then else APACHE_WANT_HSREGEX=no fi - AC_SUBST(APACHE_WANT_HSREGEX) + PHP_SUBST(APACHE_WANT_HSREGEX) PHP_APACHE_CHECK_RDYNAMIC PHP_EXTENSION(apache) PHP_OUTPUT(sapi/apache/libphp4.module) |