cvs: /php3 ChangeLog acconfig.h config.h.in configure.in /php3/functions php3_wddx.h php3_wddx_a.h php3_xml.h

rasmus Fri Sep 3 14:42:36 1999 EDT Modified files: /php3 ChangeLog acconfig.h config.h.in configure.in /php3/functions php3_wddx.h php3_wddx_a.h php3_xml.h Log: Static build wasn't picking up expat libs in Apache-1.3.9. A tad ugly to fix, but I don't really see a better way Index: php3/ChangeLog diff -u php3/ChangeLog:1.751 php3/ChangeLog:1.752 --- php3/ChangeLog:1.751 Thu Sep 2 15:52:11 1999 +++ php3/ChangeLog Fri Sep 3 14:42:34 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Make --with-apache --with-xml pick up Apache-bundled expat lib - 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 Index: php3/acconfig.h diff -u php3/acconfig.h:1.111 php3/acconfig.h:1.112 --- php3/acconfig.h:1.111 Thu Sep 2 15:26:23 1999 +++ php3/acconfig.h Fri Sep 3 14:42:35 1999 @@ -340,6 +340,9 @@ /* Define if you have the expat (XML Parser Toolkit) library */ #define HAVE_LIBEXPAT 0 +/* Define if your xml include files are not in an dir named xml */ +#define RAW_XML_INCLUDEPATH 0 + /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 Index: php3/config.h.in diff -u php3/config.h.in:1.191 php3/config.h.in:1.192 --- php3/config.h.in:1.191 Thu Sep 2 15:26:23 1999 +++ php3/config.h.in Fri Sep 3 14:42:35 1999 @@ -232,8 +232,8 @@ /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 -/* define if you want MCAL */ -#define HAVE_MCAL 0 +/* Define if you want MCAL */ +#define HAVE_MCAL 0 /* Define if you want the IMSP options/addressbook interface */ #define HAVE_IMSP 0 @@ -377,6 +377,9 @@ /* Define if you have the expat (XML Parser Toolkit) library */ #define HAVE_LIBEXPAT 0 + +/* Define if your xml include files are not in an dir named xml */ +#define RAW_XML_INCLUDEPATH 0 /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 Index: php3/configure.in diff -u php3/configure.in:1.456 php3/configure.in:1.457 --- php3/configure.in:1.456 Thu Sep 2 15:36:54 1999 +++ php3/configure.in Fri Sep 3 14:42:35 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.456 1999/09/02 19:36:54 rasmus Exp $ +dnl $Id: configure.in,v 1.457 1999/09/03 18:42:35 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -319,6 +319,7 @@ withval=/usr/local/etc/httpd fi if test "$withval" != "no"; then + APACHE_WITHVAL=$withval # figure out extra library nonsense # For Apache 1.2.x if test -f $withval/src/httpd.h; then @@ -1832,13 +1833,22 @@ AC_ARG_WITH(xml, [ --with-xml Include XML support],[ if test "$withval" != "no" ; then - for i in /usr /usr/local $withval ; do + for i in $withval /usr /usr/local; do if test -f "$i/include/xml/xmltok.h" ; then XML_DIR=$i XML_INCLUDE="$i/include/xml" XML_LIB="$i/lib" fi done + if test "$XML_DIR" = "" ; then + if test -n "$APACHE_WITHVAL"; then + if test -f "$APACHE_WITHVAL/src/lib/expat-lite/xmltok.h"; then + XML_DIR=$APACHE_WITHVAL + XML_INCLUDE="$APACHE_WITHVAL/src/lib/expat-lite" + AC_DEFINE(RAW_XML_INCLUDEPATH) + fi + fi + fi if test -n "$APXS"; then i="$APXS -q INCLUDEDIR" if test -f "$i/xml/xmltok.h"; then Index: php3/functions/php3_wddx.h diff -u php3/functions/php3_wddx.h:1.1 php3/functions/php3_wddx.h:1.2 --- php3/functions/php3_wddx.h:1.1 Tue Jan 5 20:32:54 1999 +++ php3/functions/php3_wddx.h Fri Sep 3 14:42:35 1999 @@ -27,14 +27,18 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_wddx.h,v 1.1 1999/01/06 01:32:54 sas Exp $ */ +/* $Id: php3_wddx.h,v 1.2 1999/09/03 18:42:35 rasmus Exp $ */ #ifndef _WDDX_H #define _WDDX_H #if HAVE_LIBEXPAT -#include "xml/xmlparse.h" +#if RAW_XML_INCLUDEPATH +#include <xmlparse.h> +#else +#include <xml/xmlparse.h> +#endif extern php3_module_entry wddx_module_entry; #define wddx_module_ptr &wddx_module_entry Index: php3/functions/php3_wddx_a.h diff -u php3/functions/php3_wddx_a.h:1.1 php3/functions/php3_wddx_a.h:1.2 --- php3/functions/php3_wddx_a.h:1.1 Tue Feb 2 00:44:12 1999 +++ php3/functions/php3_wddx_a.h Fri Sep 3 14:42:36 1999 @@ -27,14 +27,18 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_wddx_a.h,v 1.1 1999/02/02 05:44:12 andrey Exp $ */ +/* $Id: php3_wddx_a.h,v 1.2 1999/09/03 18:42:36 rasmus Exp $ */ #ifndef _WDDX_A_H #define _WDDX_A_H #if HAVE_LIBEXPAT -#include "xml/xmlparse.h" +#if RAW_XML_INCLUDEPATH +#include <xmlparse.h> +#else +#include <xml/xmlparse.h> +#endif extern int php3_minit_wddx(INIT_FUNC_ARGS); Index: php3/functions/php3_xml.h diff -u php3/functions/php3_xml.h:1.12 php3/functions/php3_xml.h:1.13 --- php3/functions/php3_xml.h:1.12 Mon May 10 04:52:02 1999 +++ php3/functions/php3_xml.h Fri Sep 3 14:42:36 1999 @@ -34,8 +34,13 @@ # define _PHP_XML_H # endif +#if RAW_XML_INCLUDEPATH +#include <xmltok.h> +#include <xmlparse.h> +#else #include <xml/xmltok.h> #include <xml/xmlparse.h> +#endif #ifdef XML_UNICODE # error "UTF-16 Unicode support not implemented!"