summaryrefslogtreecommitdiff
path: root/sapi/apache
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/apache')
-rw-r--r--sapi/apache/Makefile.am4
-rw-r--r--sapi/apache/Makefile.inc24
-rw-r--r--sapi/apache/config.m427
-rw-r--r--sapi/apache/libphp4.module.in2
-rw-r--r--sapi/apache/mod_php4.c2
-rw-r--r--sapi/apache/sapi_apache.c (renamed from sapi/apache/apache.c)0
6 files changed, 19 insertions, 40 deletions
diff --git a/sapi/apache/Makefile.am b/sapi/apache/Makefile.am
index e5c8b14a99..38404758dc 100644
--- a/sapi/apache/Makefile.am
+++ b/sapi/apache/Makefile.am
@@ -2,5 +2,5 @@
APACHE_INCLUDE=@APACHE_INCLUDE@
INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend $(APACHE_INCLUDE)
-noinst_LIBRARIES=libphpsapi_apache.a
-libphpsapi_apache_a_SOURCES=apache.c
+noinst_LTLIBRARIES=libphpsapi_apache.la
+libphpsapi_apache_la_SOURCES=sapi_apache.c mod_php4.c
diff --git a/sapi/apache/Makefile.inc b/sapi/apache/Makefile.inc
deleted file mode 100644
index bef1954320..0000000000
--- a/sapi/apache/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-INSTALL_IT=$(APACHE_INSTALL)
-
-# Apache modules
-libphp4.a libmodphp4.a: all-recursive $(OBJS) sapi/libphpsapi.a $(REGEX_LIB)
- $(AR) $@.tmp $(OBJS)
- $(srcdir)/scripts/armerge $@ $@.tmp \
- ext/libphpext.a libzend/libzend.a sapi/libphpsapi.a $(TSRM_LIB)
- @rm -f $@.tmp
- $(RANLIB) $(SAPI_TARGET)
-
-# Apache modules
-libmodphp4-so.a: all-recursive $(OBJS) sapi/libphpsapi.a $(REGEX_LIB)
- $(AR) $@.tmp $(OBJS)
- $(srcdir)/scripts/armerge $@ $@.tmp \
- ext/libphpext.a libzend/libzend.a sapi/libphpsapi.a $(TSRM_LIB)
- @rm -f $@.tmp
- $(RANLIB) libmodphp4-so.a
-
-# Apache 1.3 shared module
-libphp4.so: libmodphp4-so.a $(REGEX_LIB)
- (cd sapi/apache; $(MAKE) mod_php4.o)
- $(APXS) $(INCLUDE) -c -o libphp4.so $(VERSION_SCRIPT) $(RPATHS) sapi/apache/mod_php4.o libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP)
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 2a1e66298c..ad685fe181 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -15,16 +15,16 @@ AC_ARG_WITH(apxs,
if test -d "$APXS_INCLUDEDIR/xml" ; then
XML_INCLUDE="$APXS_INCLUDEDIR/xml"
fi
- APACHE_INCLUDE="-I$APXS_INCLUDEDIR"
+ AC_ADD_INCLUDE($APXS_INCLUDEDIR)
+ PHP_EXTENSION(apache)
PHP_SAPI=apache
SAPI_TARGET=libphp4.so
- APACHE_INSTALL="\$(APXS) -i -a -n php4 $SAPI_TARGET"
+ APACHE_INSTALL="$APXS -i -a -n php4 libs/libphp4.so"
+ PHP_BUILD_SHARED
CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2`
LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2`
LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
- PHP_LIBS=
STRONGHOLD=
- INCLUDES="$INCLUDES $APACHE_INCLUDE"
AC_DEFINE(APACHE)
AC_DEFINE(HAVE_AP_CONFIG_H)
AC_DEFINE(HAVE_AP_COMPAT_H)
@@ -35,7 +35,6 @@ AC_ARG_WITH(apxs,
APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module"
-if test "$SAPI_TARGET" != "libmodphp4-so.a"; then
if test "$SAPI_TARGET" != "libphp4.so"; then
AC_MSG_CHECKING(for Apache module support)
AC_ARG_WITH(apache,
@@ -71,8 +70,8 @@ AC_ARG_WITH(apache,
mkdir $APACHE_TARGET
fi
PHP_SAPI=apache
- SAPI_TARGET=libmodphp4.a
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ SAPI_TARGET=libs/libphp4.a
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.3.x)
@@ -101,9 +100,9 @@ AC_ARG_WITH(apache,
mkdir $APACHE_TARGET
fi
PHP_SAPI=apache
- SAPI_TARGET=libmodphp4.a
+ SAPI_TARGET=libs/libphp4.a
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
@@ -125,9 +124,9 @@ AC_ARG_WITH(apache,
APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
APACHE_TARGET=$withval/apache
PHP_SAPI=apache
- SAPI_TARGET=libmodphp4.a
+ SAPI_TARGET=libs/libphp4.a
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET"
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
STRONGHOLD=-DSTRONGHOLD=1
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - StrongHold)
@@ -158,7 +157,6 @@ AC_ARG_WITH(apache,
INCLUDES="$INCLUDES $APACHE_INCLUDE"
dnl## AC_SUBST(APACHE_INCLUDE)
fi
-fi
if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
APXS_EXP="-bE:sapi/apache/mod_php4.exp"
@@ -183,9 +181,14 @@ AC_ARG_WITH(mod_charset,
])
if test -n "$APACHE_MODULE"; then
+ PHP_EXTENSION(apache)
PHP_OUTPUT(sapi/apache/libphp4.module)
+ PHP_BUILD_STATIC
fi
+if test -n "$APACHE_INSTALL"; then
+ INSTALL_IT=$APACHE_INSTALL
+fi
dnl ## Local Variables:
dnl ## tab-width: 4
diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in
index 9b80f6c742..687c1c46ac 100644
--- a/sapi/apache/libphp4.module.in
+++ b/sapi/apache/libphp4.module.in
@@ -1,7 +1,7 @@
Name: php4_module
ConfigStart
RULE_WANTHSREGEX=@HSREGEX@
- LIBS="@RPATHS@ @PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ @RDYNAMIC_LFLAGS@ $LIBS"
+ LIBS="@NATIVE_RPATHS@ @PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ $LIBS"
RULE_HIDE=yes
CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@"
ConfigEnd
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index bb67e4a9f5..aff778db0b 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -65,7 +65,7 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod
module MODULE_VAR_EXPORT php4_module;
int saved_umask;
-static unsigned char apache_php_initialized=0;
+static unsigned char apache_php_initialized;
typedef struct _php_per_dir_entry {
char *key;
diff --git a/sapi/apache/apache.c b/sapi/apache/sapi_apache.c
index 0e8b8029af..0e8b8029af 100644
--- a/sapi/apache/apache.c
+++ b/sapi/apache/sapi_apache.c
View Lorry Controller Status