[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 20:25 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv5601 Modified Files: Makefile.in acconfig.h.in configuration-parser.y configure.in.in fopen-wrappers.c internal_functions.c main.c output.c setup tls.h Log Message: moved fdf, hyperwave, informix and some smaller files Index: php4/Makefile.in diff -c php4/Makefile.in:1.17 php4/Makefile.in:1.18 *** php4/Makefile.in:1.17 Wed Apr 21 19:37:45 1999 --- php4/Makefile.in Wed Apr 21 20:25:51 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.17 1999/04/21 23:37:45 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.18 1999/04/22 00:25:51 ssb Exp $ # prefix = @prefix@ *************** *** 69,86 **** php_ini.o FUNCTIONS_SOURCE = functions/fhttpd.c \ ! functions/crypt.c functions/dl.c \ ! functions/head.c functions/imap.c functions/mime.c \ functions/pgsql.c functions/post.c functions/sybase.c \ functions/sybase-ct.c functions/xml.c \ ! functions/ldap.c functions/zlib.c functions/ifx.c \ ! functions/pdf.c \ ! functions/fdf.c functions/snmp.c functions/interbase.c \ functions/sysvsem.c functions/sysvshm.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext ! LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) --- 69,84 ---- php_ini.o FUNCTIONS_SOURCE = functions/fhttpd.c \ ! functions/imap.c functions/mime.c \ functions/pgsql.c functions/post.c functions/sybase.c \ functions/sybase-ct.c functions/xml.c \ ! functions/ldap.c functions/zlib.c \ ! functions/pdf.c functions/snmp.c functions/interbase.c \ functions/sysvsem.c functions/sysvshm.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext ! LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) *************** *** 110,118 **** regex/libregex.a: (cd regex; $(MAKE) lib) - - functions/ifx.c: functions/ifx.ec - (if test @INFORMIXDIR@; then esql -e @IFX_ESQL_FLAGS@ functions/ifx.ec; mv ifx.c functions; else touch functions/ifx.c; fi) configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c --- 108,113 ---- Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.8 php4/acconfig.h.in:1.9 *** php4/acconfig.h.in:1.8 Wed Apr 21 19:37:46 1999 --- php4/acconfig.h.in Wed Apr 21 20:25:51 1999 *************** *** 182,187 **** /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 - - /* Define if you have the fdftk library */ - #define HAVE_FDFLIB 0 --- 182,184 ---- Index: php4/configuration-parser.y diff -c php4/configuration-parser.y:1.7 php4/configuration-parser.y:1.8 *** php4/configuration-parser.y:1.7 Wed Apr 21 13:28:54 1999 --- php4/configuration-parser.y Wed Apr 21 20:25:51 1999 *************** *** 30,42 **** ! /* $Id: configuration-parser.y,v 1.7 1999/04/21 17:28:54 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" #include "php_globals.h" #include "php_ini.h" ! #include "functions/dl.h" #include "ext/standard/file.h" #include "ext/standard/php3_browscap.h" #include "zend_extensions.h" --- 30,42 ---- ! /* $Id: configuration-parser.y,v 1.8 1999/04/22 00:25:51 ssb Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" #include "php_globals.h" #include "php_ini.h" ! #include "ext/standard/dl.h" #include "ext/standard/file.h" #include "ext/standard/php3_browscap.h" #include "zend_extensions.h" Index: php4/configure.in.in diff -c php4/configure.in.in:1.12 php4/configure.in.in:1.13 *** php4/configure.in.in:1.12 Wed Apr 21 19:37:46 1999 --- php4/configure.in.in Wed Apr 21 20:25:51 1999 *************** *** 1,4 **** ! dnl $Id: configure.in.in,v 1.12 1999/04/21 23:37:46 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. --- 1,4 ---- ! dnl $Id: configure.in.in,v 1.13 1999/04/22 00:25:51 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. *************** *** 1008,1085 **** INCLUDES="$INCLUDES $SNMP_INCLUDE" - AC_MSG_CHECKING(for Informix support) - AC_ARG_WITH(informix, - [ --with-informix[=DIR] Include Informix support. DIR is the Informix base - install directory, defaults to ${INFORMIXDIR:-nothing}.], - [ - if test "$withval" != "no"; then - if test "$INFORMIXDIR" = ""; then - INFORMIX_WARNING=" - WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR - environment value set up. Configuring and compiling Informix - support to PHP3 is impossible and has been turned off. Please - try again after setting up your environment." - AC_MSG_RESULT(no) - else - if test "$withval" = "yes"; then - IFX_INCDIR=$INFORMIXDIR/incl/esql - IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql" - else - IFX_INCDIR=$withval/incl/esql - IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql" - if test "$withval" != "$INFORMIXDIR"; then - INFORMIX_WARNING=" - WARNING: You specified Informix base install directory that is different - than your \\\$INFORMIXDIR environment variable. You'd better know - exactly what you are doing." - fi - fi - IFX_INCLUDE=-I$IFX_INCDIR - IFX_LFLAGS=$IFX_LIBDIR - if test -z "$IFX_LIBS"; then - IFX_LIBS=esql -libs | sed -e 's/-lm$//' - dnl -lm twice otherwise? - IFX_LIBS=echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g' - dnl Seems to get rid of newlines. - dnl According to Perls DBD-Informix, might contain these strings. - else - dnl Allow override to use static and/or threaded libs - IFX_LIBS="$IFX_LIBS" - fi - CFLAGS="$CFLAGS $IFX_INCLUDE" - LDFLAGS="$LDFLAGS $IFX_LFLAGS" - - if test "uname -s 2>/dev/null" = "AIX"; then - CFLAGS="$CFLAGS -D__H_LOCALEDEF" - fi - AC_DEFINE(HAVE_IFX) - AC_MSG_CHECKING([Informix version]) - IFX_VERSION=[esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'] - if test $IFX_VERSION -ge "900"; then - AC_DEFINE(HAVE_IFX_IUS) - IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS" - else - IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS" - fi - AC_SUBST(IFX_ESQL_FLAGS) - AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION) - AC_MSG_RESULT(yes) - fi - else - INFORMIXDIR= - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(IFX_LIBS) - AC_SUBST(IFX_LFLAGS) - AC_SUBST(INFORMIXDIR) - dnl## AC_SUBST(IFX_INCLUDE) - INCLUDES="$INCLUDES $IFX_INCLUDE" - - AC_MSG_CHECKING(for InterBase support) AC_ARG_WITH(interbase, [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base --- 1008,1013 ---- *************** *** 1197,1236 **** INCLUDES="$INCLUDES $PDFLIB_INCLUDE" - AC_MSG_CHECKING(whether to include fdftk support) - AC_ARG_WITH(fdftk, - [ --with-fdftk[=DIR] Include fdftk support. - DIR is the fdftk lib install directory, - defaults to /usr/local.], - [ - case "$withval" in - no) - AC_MSG_RESULT(no) ;; - yes) - AC_MSG_RESULT(yes) - AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB) FDFLIB_LIBS="-lFdfTk"], - [AC_MSG_ERROR(fdftk module requires fdftk 2.0)]) ;; - *) - test -f $withval/include/Fdftk.h && FDFLIB_INCLUDE="-I$withval/include" - if test -n "$FDFLIB_INCLUDE" ; then - AC_MSG_RESULT(yes) - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB) FDFLIB_LIBS="-L$withval/lib -lFdfTk"], - [AC_MSG_ERROR(fdftk module requires ftftk lib 2.0.)]) - LIBS=$old_LIBS - else - AC_MSG_RESULT(no) - fi ;; - esac - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(FDFLIB_LIBS) - dnl## AC_SUBST(FDFLIB_INCLUDE) - INCLUDES="$INCLUDES $FDFLIB_INCLUDE" - - AC_MSG_CHECKING(whether to enable System V semaphore support) AC_ARG_ENABLE(sysvsem, [ --enable-sysvsem Enable System V semaphore support.], --- 1125,1130 ---- *************** *** 1335,1344 **** fi fi fi ! dnl Warn if Informix support was requested but environment is not set up correctly. ! if test "$INFORMIX_WARNING" != ""; then ! echo "$INFORMIX_WARNING" ! fi ]) divert --- 1229,1235 ---- fi fi fi ! ]) divert Index: php4/fopen-wrappers.c diff -c php4/fopen-wrappers.c:1.7 php4/fopen-wrappers.c:1.8 *** php4/fopen-wrappers.c:1.7 Wed Apr 21 13:11:00 1999 --- php4/fopen-wrappers.c Wed Apr 21 20:25:51 1999 *************** *** 27,33 **** | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ ! /* $Id: fopen-wrappers.c,v 1.7 1999/04/21 17:11:00 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 27,33 ---- | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ ! /* $Id: fopen-wrappers.c,v 1.8 1999/04/22 00:25:51 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 54,60 **** #include "safe_mode.h" #include "php3_realpath.h" ! #include "functions/head.h" #include "ext/standard/php3_standard.h" #include "zend_compile.h" --- 54,60 ---- #include "safe_mode.h" #include "php3_realpath.h" ! #include "ext/standard/head.h" #include "ext/standard/php3_standard.h" #include "zend_compile.h" Index: php4/internal_functions.c diff -c php4/internal_functions.c:1.12 php4/internal_functions.c:1.13 *** php4/internal_functions.c:1.12 Wed Apr 21 19:37:46 1999 --- php4/internal_functions.c Wed Apr 21 20:25:51 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.12 1999/04/21 23:37:46 ssb Exp $ */ #include "php.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.13 1999/04/22 00:25:51 ssb Exp $ */ #include "php.h" *************** *** 46,53 **** #include "ext/odbc/php3_odbc.h" #include "ext/gettext/php3_gettext.h" ! #include "functions/php3_ifx.h" ! #include "functions/php3_crypt.h" #include "functions/php3_ldap.h" #include "ext/mysql/php3_mysql.h" #include "ext/bcmath/php3_bcmath.h" --- 46,52 ---- #include "ext/odbc/php3_odbc.h" #include "ext/gettext/php3_gettext.h" ! #include "ext/informix/php3_ifx.h" #include "functions/php3_ldap.h" #include "ext/mysql/php3_mysql.h" #include "ext/bcmath/php3_bcmath.h" *************** *** 58,65 **** #include "functions/php3_sybase.h" #include "functions/php3_sybase-ct.h" #include "functions/imap.h" ! #include "functions/dl.h" ! #include "functions/head.h" #include "functions/post.h" #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" --- 57,63 ---- #include "functions/php3_sybase.h" #include "functions/php3_sybase-ct.h" #include "functions/imap.h" ! #include "ext/standard/head.h" #include "functions/post.h" #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" *************** *** 70,76 **** #include "functions/php3_interbase.h" #include "functions/php3_xml.h" #include "functions/php3_pdf.h" ! #include "functions/php3_fdf.h" #include "functions/php3_sysvsem.h" #include "functions/php3_sysvshm.h" #include "ext/dav/php3_dav.h" --- 68,74 ---- #include "functions/php3_interbase.h" #include "functions/php3_xml.h" #include "functions/php3_pdf.h" ! #include "ext/fdf/php3_fdf.h" #include "functions/php3_sysvsem.h" #include "functions/php3_sysvshm.h" #include "ext/dav/php3_dav.h" Index: php4/main.c diff -c php4/main.c:1.21 php4/main.c:1.22 *** php4/main.c:1.21 Wed Apr 21 13:28:54 1999 --- php4/main.c Wed Apr 21 20:25:51 1999 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.21 1999/04/21 17:28:54 zeev Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.22 1999/04/22 00:25:51 ssb Exp $ */ /* #define CRASH_DETECTION */ *************** *** 69,75 **** #include "fopen-wrappers.h" #include "ext/standard/php3_standard.h" #include "functions/post.h" ! #include "functions/head.h" #include "snprintf.h" #if WIN32|WINNT #include <io.h> --- 69,75 ---- #include "fopen-wrappers.h" #include "ext/standard/php3_standard.h" #include "functions/post.h" ! #include "ext/standard/head.h" #include "snprintf.h" #if WIN32|WINNT #include <io.h> Index: php4/output.c diff -c php4/output.c:1.1.1.1 php4/output.c:1.2 *** php4/output.c:1.1.1.1 Wed Apr 7 17:02:37 1999 --- php4/output.c Wed Apr 21 20:25:51 1999 *************** *** 15,21 **** #include "php.h" ! #include "functions/head.h" /* output functions */ int (*zend_body_write)(const char *str, uint str_length); /* string output */ --- 15,21 ---- #include "php.h" ! #include "ext/standard/head.h" /* output functions */ int (*zend_body_write)(const char *str, uint str_length); /* string output */ Index: php4/setup diff -c php4/setup:1.7 php4/setup:1.8 *** php4/setup:1.7 Wed Apr 21 19:27:59 1999 --- php4/setup Wed Apr 21 20:25:51 1999 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.7 1999/04/21 23:27:59 ssb Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 29,35 ---- # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.8 1999/04/22 00:25:51 ssb Exp $ if [ "$1" = "-q" ]; then quiet_mode=on *************** *** 282,292 **** 'no /usr/local pdflib install' \ ' Whether to use the pdflib support to write .pdf-files.\n Tested for version 0.6!' - - define_option with-fdftk 'Acrobat Forms (Ftf Toolkit 2.0) support? ' yesnodir \ - 'no /usr/local ftktk install' \ - ' Whether to use the Ftf Toolkit support to write/read .fdf-files.\n - Tested for version 2.0!' define_option with-zlib 'zlib (>= 1.0.9) support? ' yesnodir \ 'no /usr zlib install' \ --- 282,287 ---- Index: php4/tls.h diff -c php4/tls.h:1.3 php4/tls.h:1.4 *** php4/tls.h:1.3 Wed Apr 21 19:27:59 1999 --- php4/tls.h Wed Apr 21 20:25:51 1999 *************** *** 36,42 **** #endif #include "alloc.h" ! #include "functions/head.h" #include "ext/bcmath/number.h" #include "constants.h" #include <sys/stat.h> --- 36,42 ---- #endif #include "alloc.h" ! #include "ext/standard/head.h" #include "ext/bcmath/number.h" #include "constants.h" #include <sys/stat.h> -- PHP 4 Beta