@@ -58,34 +58,34 @@ AC_ARG_WITH(apxs,
5858 *darwin*)
5959 MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
6060 PHP_SUBST(MH_BUNDLE_FLAGS)
61- SAPI_SHARED=libs/libphp4 .so
61+ SAPI_SHARED=libs/libphp5 .so
6262 build_type=bundle
6363 ;;
6464 *)
6565 build_type=shared
6666 ;;
6767 esac
6868
69- PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php4 .c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
69+ PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php5 .c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
7070
7171 # Test whether apxs support -S option
7272 $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
7373
7474 if test "$?" != "0"; then
75- APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option
75+ APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
7676 else
7777 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
7878 if test -z `$APXS -q SYSCONFDIR`; then
7979 APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
8080 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
81- -i -n php4 $SAPI_SHARED"
81+ -i -n php5 $SAPI_SHARED"
8282 else
8383 APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
8484 APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
8585 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
8686 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
8787 -S SYSCONFDIR='$APXS_SYSCONFDIR' \
88- -i -a -n php4 $SAPI_SHARED"
88+ -i -a -n php5 $SAPI_SHARED"
8989 fi
9090 fi
9191
@@ -107,7 +107,7 @@ AC_ARG_WITH(apache,
107107[ --with-apache[ =DIR] Build Apache 1.x module. DIR is the top-level Apache
108108 build directory, defaults to /usr/local/apache.] ,[
109109
110- APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4 .* sapi/apache/libphp4 .module"
110+ APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5 .* sapi/apache/libphp5 .module"
111111
112112 if test "$withval" = "yes"; then
113113 # Apache's default directory
@@ -121,7 +121,7 @@ AC_ARG_WITH(apache,
121121 if test -f $withval/src/httpd.h; then
122122 APACHE_INCLUDE=-I$withval/src
123123 APACHE_TARGET=$withval/src
124- PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4 .c php_apache.c, $APACHE_INCLUDE)
124+ PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5 .c php_apache.c, $APACHE_INCLUDE)
125125 APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
126126 PHP_LIBS="-L. -lphp3"
127127 AC_MSG_RESULT ( yes - Apache 1.2.x )
@@ -137,13 +137,13 @@ AC_ARG_WITH(apache,
137137 elif test -f $withval/src/main/httpd.h; then
138138 APACHE_HAS_REGEX=1
139139 APACHE_INCLUDE="-I$withval/src/main -I$withval/src/os/unix -I$withval/src/ap"
140- APACHE_TARGET=$withval/src/modules/php4
140+ APACHE_TARGET=$withval/src/modules/php5
141141 if test ! -d $APACHE_TARGET; then
142142 mkdir $APACHE_TARGET
143143 fi
144- PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4 .c php_apache.c, $APACHE_INCLUDE)
145- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4 .a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
146- PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4 "
144+ PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5 .c php_apache.c, $APACHE_INCLUDE)
145+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5 .a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
146+ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5 "
147147 AC_MSG_RESULT ( yes - Apache 1.3.x )
148148 STRONGHOLD=
149149 if test -f $withval/src/include/ap_config.h; then
@@ -163,13 +163,13 @@ AC_ARG_WITH(apache,
163163 elif test -f $withval/src/include/httpd.h; then
164164 APACHE_HAS_REGEX=1
165165 APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
166- APACHE_TARGET=$withval/src/modules/php4
166+ APACHE_TARGET=$withval/src/modules/php5
167167 if test ! -d $APACHE_TARGET; then
168168 mkdir $APACHE_TARGET
169169 fi
170- PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4 .c php_apache.c, $APACHE_INCLUDE)
171- PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4 "
172- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4 .a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
170+ PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5 .c php_apache.c, $APACHE_INCLUDE)
171+ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5 "
172+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5 .a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
173173 AC_MSG_RESULT ( yes - Apache 1.3.x )
174174 STRONGHOLD=
175175 if test -f $withval/src/include/ap_config.h; then
@@ -189,9 +189,9 @@ AC_ARG_WITH(apache,
189189 elif test -f $withval/apache/httpd.h; then
190190 APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
191191 APACHE_TARGET=$withval/apache
192- PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4 .c php_apache.c, $APACHE_INCLUDE)
193- PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4 "
194- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4 .a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
192+ PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5 .c php_apache.c, $APACHE_INCLUDE)
193+ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5 "
194+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5 .a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
195195 STRONGHOLD=-DSTRONGHOLD=1
196196 AC_MSG_RESULT ( yes - StrongHold )
197197 if test -f $withval/apache/ap_config.h; then
@@ -221,7 +221,7 @@ AC_ARG_WITH(apache,
221221fi
222222
223223if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
224- APXS_EXP=-bE:sapi/apache/mod_php4 .exp
224+ APXS_EXP=-bE:sapi/apache/mod_php5 .exp
225225fi
226226
227227PHP_SUBST(APXS_EXP)
@@ -256,7 +256,7 @@ AC_ARG_WITH(mod_charset,
256256if test -n "$APACHE_MODULE"; then
257257 PHP_TARGET_RDYNAMIC
258258 $php_shtool mkdir -p sapi/apache
259- PHP_OUTPUT(sapi/apache/libphp4 .module)
259+ PHP_OUTPUT(sapi/apache/libphp5 .module)
260260fi
261261
262262if test -n "$APACHE_INSTALL"; then
0 commit comments