cvs: /php3 ChangeLog Makefile.in configure.in

rasmus Thu Sep 2 15:36:55 1999 EDT Modified files: /php3 ChangeLog Makefile.in configure.in Log: Remove any perl requirement from apxs build Carry Apache CFLAGS into PHP build to pick up important ones like the mod_ssl-related -DEAPI Index: php3/ChangeLog diff -u php3/ChangeLog:1.749 php3/ChangeLog:1.750 --- php3/ChangeLog:1.749 Tue Aug 31 09:24:46 1999 +++ php3/ChangeLog Thu Sep 2 15:36:54 1999 @@ -2,6 +2,9 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Remove Perl requirement for apxs build (Rasmus) +- Carry special Apache CFLAGS into PHP build for apxs build + This should fix any PHP/mod_ssl compile issues (Rasmus) - Fixed a crash that would occur if wddx_deserialize did not receive a valid packet (Andrey) - Fixed sem_get() on AIX (Sascha) Index: php3/Makefile.in diff -u php3/Makefile.in:1.347 php3/Makefile.in:1.348 --- php3/Makefile.in:1.347 Thu Sep 2 15:26:23 1999 +++ php3/Makefile.in Thu Sep 2 15:36:54 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.347 1999/09/02 19:26:23 musone Exp $ +# $Id: Makefile.in,v 1.348 1999/09/02 19:36:54 rasmus Exp $ # prefix = @prefix@ @@ -43,10 +43,9 @@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ -LDFLAGS_SHLIB_EXPORT = @LDFLAGS_SHLIB_EXPORT@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ $(CFLAGS_SHLIB) $(CPPFLAGS) $(INCLUDE) @DEBUG_CFLAGS@ @STRONGHOLD@ $(PROF_CFLAGS) -LDFLAGS = @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT) +LDFLAGS = @LDFLAGS@ $(LDFLAGS_SHLIB) REGCFLAGS = $(CFLAGS) RANLIB = @RANLIB@ YACC = @YACC@ Index: php3/configure.in diff -u php3/configure.in:1.455 php3/configure.in:1.456 --- php3/configure.in:1.455 Wed Sep 1 16:49:03 1999 +++ php3/configure.in Thu Sep 2 15:36:54 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.455 1999/09/01 20:49:03 musone Exp $ +dnl $Id: configure.in,v 1.456 1999/09/02 19:36:54 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -274,8 +274,7 @@ AC_MSG_CHECKING(for Apache module support via DSO through APXS) AC_ARG_WITH(apxs, [ --with-apxs[=FILE] Build shared Apache module. FILE is the optional - pathname to the Apache apxs tool; defaults to "apxs". - (This option needs Perl installed)], + pathname to the Apache apxs tool; defaults to "apxs".], [ if test "$withval" = "yes"; then withval=apxs @@ -286,9 +285,9 @@ APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" - 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 + CFLAGS_SHLIB="$APXS -q CFLAGS_SHLIB" + LDFLAGS_SHLIB="$APXS -q LDFLAGS_SHLIB" + CFLAGS="$CFLAGS $APXS -q CFLAGS" PHP_LIBS=-L/usr/local/lib STRONGHOLD= AC_DEFINE(APACHE) @@ -298,7 +297,7 @@ AC_SUBST(INSTALL_IT) AC_SUBST(PHP_LIBS) AC_DEFINE(HAVE_AP_CONFIG_H) - AC_DEFINE(HAVE_AP_COMPAT_H) + AC_DEFINE(HAVE_AP_COMPAT_H) AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) @@ -2842,7 +2841,6 @@ AC_SUBST(PROG_SENDMAIL) AC_SUBST(CFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB) -AC_SUBST(LDFLAGS_SHLIB_EXPORT) AC_SUBST(INCLUDES) AC_SUBST(EXTRA_LIBS) AC_SUBST(RPATHS)