[PHP4BETA] CVS update: php4

Date: Sunday April 25, 1999 @ 10:10 Author: rasmus Update of /repository/php4 In directory php:/tmp/cvs-serv2324 Modified Files: Makefile.in acconfig.h.in configure.in.in Log Message: Ok, this beast compiles via --with-apxs Not sure if it actually works yet though. I have a feeling there are some -fpic flags missing in the libzend build. Will test later on today. Index: php4/Makefile.in diff -u php4/Makefile.in:1.21 php4/Makefile.in:1.22 --- php4/Makefile.in:1.21 Thu Apr 22 18:28:17 1999 +++ php4/Makefile.in Sun Apr 25 10:10:22 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.21 1999/04/22 22:28:17 zeev Exp $ +# $Id: Makefile.in,v 1.22 1999/04/25 14:10:22 rasmus Exp $ # prefix = @prefix@ @@ -56,7 +56,7 @@ YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ -APXS_LDFLAGS = @APXS_LDFLAGS@ +APXS_LDFLAGS = $(EXTRA_LIBS) WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ @@ -87,11 +87,18 @@ $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) # Apache modules -libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) +libphp3.a libmodphp3.a: all-recursive $(OBJS) $(AR) $@.tmp $(OBJS) $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @rm -f $@.tmp $(RANLIB) $(BINNAME) + +# Apache modules +libmodphp3-so.a: all-recursive $(OBJS) + $(AR) $@.tmp $(OBJS) + $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a + @rm -f $@.tmp + $(RANLIB) libmodphp3-so.a # Apache 1.3 shared module libphp3.so: $(srcdir)/mod_php3.c libmodphp3-so.a Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.14 php4/acconfig.h.in:1.15 --- php4/acconfig.h.in:1.14 Sat Apr 24 17:55:44 1999 +++ php4/acconfig.h.in Sun Apr 25 10:10:22 1999 @@ -37,6 +37,9 @@ /* Define if you have the bind library (-lbind). */ #define HAVE_LIBBIND 0 +/* Define if you have Netscape LDAP instead of umich ldap or openldap*/ +#define HAVE_NSLDAP 0 + /* Define if you want safe mode enabled by default. */ #define PHP_SAFE_MODE 0 Index: php4/configure.in.in diff -u php4/configure.in.in:1.19 php4/configure.in.in:1.20 --- php4/configure.in.in:1.19 Sat Apr 24 19:36:25 1999 +++ php4/configure.in.in Sun Apr 25 10:10:22 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.19 1999/04/24 23:36:25 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.20 1999/04/25 14:10:22 rasmus Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -96,7 +96,7 @@ AC_MSG_RESULT($php_cv_cc_dashr) if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch="-R" - apxs_runpath_switch="-Wl,-R" + apxs_runpath_switch="-Wl,-R'" else AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ @@ -107,11 +107,11 @@ AC_MSG_RESULT($php_cv_cc_rpath) if test $php_cv_cc_rpath = "yes"; then ld_runpath_switch="-Wl,-rpath," - apxs_runpath_switch="-Wl,-rpath " + apxs_runpath_switch="-Wl,'-rpath " else dnl something innocuous ld_runpath_switch="-L" - apxs_runpath_switch="-L" + apxs_runpath_switch="-L'" fi fi @@ -325,12 +325,14 @@ LDFLAGS_SHLIB_EXPORT=perl -V:ccdlflags | cut -d\' -f2 PHP_LIBS= STRONGHOLD= + INCLUDES="$INCLUDES $APACHE_INCLUDE" AC_DEFINE(APACHE) AC_SUBST(APXS) AC_SUBST(APXS_LDFLAGS) AC_SUBST(BINNAME) AC_SUBST(INSTALL_IT) AC_SUBST(PHP_LIBS) + AC_SUBST(APACHE_INCLUDE) AC_DEFINE(HAVE_AP_CONFIG_H) AC_DEFINE(HAVE_AP_COMPAT_H) AC_MSG_RESULT(yes) -- PHP 4 Beta