CVS update: php3

Date: Tuesday October 20, 1998 @ 20:13 Author: ssb Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv27065 Modified Files: Makefile.in acconfig.h config.h.in configure.in internal_functions.c libphp3.module.in Log Message: Added native support for James Clark's expat (XML Parser Toolkit). PHP can now parse and transform XML documents without going through external programs. Index: php3/Makefile.in diff -c php3/Makefile.in:1.267 php3/Makefile.in:1.268 *** php3/Makefile.in:1.267 Mon Oct 19 13:19:03 1998 --- php3/Makefile.in Tue Oct 20 20:13:40 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.267 1998/10/19 17:19:03 steinm Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.268 1998/10/21 00:13:40 ssb Exp $ # prefix = @prefix@ *************** *** 84,90 **** functions/string.c functions/syslog.c functions/type.c \ functions/uniqid.c functions/sybase.c \ functions/sybase-ct.c functions/url.c functions/base64.c \ ! functions/info.c @BCMATH_SRC@ \ functions/unified_odbc.c functions/ldap.c functions/browscap.c \ functions/velocis.c functions/gdttf.c functions/gdcache.c \ functions/zlib.c functions/COM.c functions/ifx.c \ --- 84,90 ---- functions/string.c functions/syslog.c functions/type.c \ functions/uniqid.c functions/sybase.c \ functions/sybase-ct.c functions/url.c functions/base64.c \ ! functions/info.c @BCMATH_SRC@ functions/xml.c \ functions/unified_odbc.c functions/ldap.c functions/browscap.c \ functions/velocis.c functions/gdttf.c functions/gdcache.c \ functions/zlib.c functions/COM.c functions/ifx.c \ *************** *** 93,99 **** FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @LIBS@ all: $(BINNAME) --- 93,99 ---- FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) *************** *** 622,627 **** --- 622,631 ---- fopen-wrappers.h mod_php3.h stack.h operators.h token_cache.h \ variables.h constants.h internal_functions.h modules.h \ functions/php3_interbase.h php3_list.h functions/php3_string.h + functions/xml.o: functions/xml.c php.h php_version.h config.h request_info.h \ + php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \ + mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ + internal_functions.h modules.h functions/php3_xml.h # Local Variables: Index: php3/acconfig.h diff -c php3/acconfig.h:1.67 php3/acconfig.h:1.68 *** php3/acconfig.h:1.67 Tue Oct 6 09:51:37 1998 --- php3/acconfig.h Tue Oct 20 20:13:41 1998 *************** *** 230,232 **** --- 230,239 ---- /* Define if you have broken sprintf function like SunOS 4 */ #define BROKEN_SPRINTF 0 + + /* Define if you have the expat (XML Parser Toolkit) library */ + #define HAVE_LIBEXPAT 0 + + /* Define if you have the pdflib library */ + #define HAVE_PDFLIB 0 + Index: php3/config.h.in diff -c php3/config.h.in:1.119 php3/config.h.in:1.120 *** php3/config.h.in:1.119 Tue Oct 20 08:40:17 1998 --- php3/config.h.in Tue Oct 20 20:13:41 1998 *************** *** 98,106 **** /* Define if you have the zlib library */ #define HAVE_ZLIB 0 - /* Define if you have the pdflib library */ - #define HAVE_PDFLIB 0 - /* Define if you have the gd version 1.3 library (-lgd). */ #define HAVE_LIBGD13 0 --- 98,103 ---- *************** *** 274,279 **** --- 271,282 ---- /* Define if you have broken sprintf function like SunOS 4 */ #define BROKEN_SPRINTF 0 + /* Define if you have the expat (XML Parser Toolkit) library */ + #define HAVE_LIBEXPAT 0 + + /* Define if you have the pdflib library */ + #define HAVE_PDFLIB 0 + /* Define if you have the crypt function. */ #undef HAVE_CRYPT *************** *** 402,407 **** --- 405,413 ---- /* Define if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H + + /* Define if you have the <mysql/mysql.h> header file. */ + #undef HAVE_MYSQL_MYSQL_H /* Define if you have the <ndir.h> header file. */ #undef HAVE_NDIR_H Index: php3/configure.in diff -c php3/configure.in:1.265 php3/configure.in:1.266 *** php3/configure.in:1.265 Mon Oct 19 13:19:04 1998 --- php3/configure.in Tue Oct 20 20:13:41 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.265 1998/10/19 17:19:04 steinm Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.266 1998/10/21 00:13:41 ssb Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 895,901 **** dnl check for errmsg.h, which isn't installed by some versions of 3.21 old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" ! AC_CHECK_HEADERS(errmsg.h) CPPFLAGS="$old_CPPFLAGS" else AC_MSG_RESULT(no) --- 895,901 ---- dnl check for errmsg.h, which isn't installed by some versions of 3.21 old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" ! AC_CHECK_HEADERS(errmsg.h mysql/mysql.h) CPPFLAGS="$old_CPPFLAGS" else AC_MSG_RESULT(no) *************** *** 1260,1265 **** --- 1260,1281 ---- AC_DEFINE(HYPERWAVE,0) AC_MSG_RESULT(no) ]) + + + AC_MSG_CHECKING(for XML support) + AC_ARG_WITH(xml, + [ --with-xml Include XML support],[ + if test "$withval" = "yes"; then + AC_DEFINE(HAVE_LIBEXPAT, 1) + AC_MSG_RESULT(yes) + XML_LIBS="-lexpat" + else + AC_MSG_RESULT(no) + fi + ],[ + AC_MSG_RESULT(no) + ]) + AC_SUBST(XML_LIBS) AC_MSG_CHECKING(whether to include zlib support) Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.329 php3/internal_functions.c:1.330 *** php3/internal_functions.c:1.329 Mon Oct 19 13:19:04 1998 --- php3/internal_functions.c Tue Oct 20 20:13:41 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.329 1998/10/19 17:19:04 steinm Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.330 1998/10/21 00:13:41 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 90,95 **** --- 90,96 ---- #include "functions/php3_zlib.h" #include "functions/php3_COM.h" #include "functions/php3_interbase.h" + #include "functions/php3_xml.h" #include "functions/php3_pdf.h" *************** *** 147,153 **** {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, {"InterBase", php3_ibase_module_ptr}, ! {"PDF", pdf_module_ptr}, {NULL, NULL} }; --- 148,155 ---- {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, {"InterBase", php3_ibase_module_ptr}, ! {"XML", xml_module_ptr}, ! {"PDF", pdf_module_ptr}, {NULL, NULL} }; Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.14 php3/libphp3.module.in:1.15 *** php3/libphp3.module.in:1.14 Tue Oct 6 09:51:40 1998 --- php3/libphp3.module.in Tue Oct 20 20:13:42 1998 *************** *** 1,7 **** Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd --- 1,7 ---- Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net