[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 19:27 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv29864 Modified Files: Makefile.in acconfig.h.in configure.in.in internal_functions.c php.h setup tls.h Log Message: moved bcmath Index: php4/Makefile.in diff -c php4/Makefile.in:1.15 php4/Makefile.in:1.16 *** php4/Makefile.in:1.15 Wed Apr 21 19:11:18 1999 --- php4/Makefile.in Wed Apr 21 19:27:59 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.15 1999/04/21 23:11:18 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.16 1999/04/21 23:27:59 ssb Exp $ # prefix = @prefix@ *************** *** 72,78 **** functions/crypt.c functions/db.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 @BCMATH_SRC@ functions/xml.c \ functions/ldap.c functions/zlib.c functions/ifx.c \ functions/pdf.c \ functions/fdf.c functions/snmp.c functions/interbase.c \ --- 72,78 ---- functions/crypt.c functions/db.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 \ *************** *** 80,86 **** 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@ @MYSQL_LFLAGS@ @MYSQL_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) --- 80,86 ---- 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) Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.6 php4/acconfig.h.in:1.7 *** php4/acconfig.h.in:1.6 Wed Apr 21 19:11:18 1999 --- php4/acconfig.h.in Wed Apr 21 19:27:59 1999 *************** *** 150,158 **** /* Define if you want to enable PHP RPC (experimental) */ #define PHP_RPC 0 - /* Define if you want to enable bc style precision math support */ - #define WITH_BCMATH 0 - /* Define if you want to prevent the CGI from working unless REDIRECT_STATUS is defined in the environment */ #define FORCE_CGI_REDIRECT 0 --- 150,155 ---- Index: php4/configure.in.in diff -c php4/configure.in.in:1.10 php4/configure.in.in:1.11 *** php4/configure.in.in:1.10 Wed Apr 21 19:11:18 1999 --- php4/configure.in.in Wed Apr 21 19:27:59 1999 *************** *** 1,4 **** ! dnl $Id: configure.in.in,v 1.10 1999/04/21 23:11:18 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. --- 1,4 ---- ! dnl $Id: configure.in.in,v 1.11 1999/04/21 23:27:59 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. *************** *** 709,734 **** dnl AC_DEFINE(PHP_RPC, 0) dnl AC_MSG_RESULT(no) dnl ]) - - AC_MSG_CHECKING(whether to enable bc style precision math functions) - AC_ARG_ENABLE(bcmath, - [ --disable-bcmath Compile without bc style precision math functions. ], - [ - if test "$enableval" = "yes"; then - AC_DEFINE(WITH_BCMATH, 1) - AC_MSG_RESULT(yes) - BCMATH_SRC="functions/bcmath.c functions/number.c" - else - AC_DEFINE(WITH_BCMATH, 0) - AC_MSG_RESULT(no) - BCMATH_SRC="" - fi - ],[ - AC_DEFINE(WITH_BCMATH, 1) - AC_MSG_RESULT(yes) - BCMATH_SRC="functions/bcmath.c functions/number.c" - ]) - AC_SUBST(BCMATH_SRC) if test "$BINNAME" = "php"; then AC_MSG_CHECKING(whether to force Apache CGI redirect) --- 709,714 ---- Index: php4/internal_functions.c diff -c php4/internal_functions.c:1.10 php4/internal_functions.c:1.11 *** php4/internal_functions.c:1.10 Wed Apr 21 18:49:13 1999 --- php4/internal_functions.c Wed Apr 21 19:27:59 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.10 1999/04/21 22:49:13 ssb Exp $ */ #include "php.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.11 1999/04/21 23:27:59 ssb Exp $ */ #include "php.h" *************** *** 50,56 **** #include "functions/php3_crypt.h" #include "functions/php3_ldap.h" #include "ext/mysql/php3_mysql.h" ! #include "functions/php3_bcmath.h" #include "ext/msql/php3_msql.h" #include "ext/oracle/php3_oci8.h" #include "ext/oracle/oracle.h" --- 50,56 ---- #include "functions/php3_crypt.h" #include "functions/php3_ldap.h" #include "ext/mysql/php3_mysql.h" ! #include "ext/bcmath/php3_bcmath.h" #include "ext/msql/php3_msql.h" #include "ext/oracle/php3_oci8.h" #include "ext/oracle/oracle.h" *************** *** 61,72 **** #include "functions/dl.h" #include "functions/head.h" #include "functions/post.h" ! #include "functions/hw.h" #include "ext/filepro/filepro.h" #include "functions/db.h" #include "dl/snmp/php3_snmp.h" #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" --- 61,72 ---- #include "functions/dl.h" #include "functions/head.h" #include "functions/post.h" ! #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" #include "functions/db.h" #include "dl/snmp/php3_snmp.h" #include "functions/php3_zlib.h" ! #include "ext/com/php3_COM.h" #include "functions/php3_interbase.h" #include "functions/php3_xml.h" #include "functions/php3_pdf.h" Index: php4/php.h diff -c php4/php.h:1.9 php4/php.h:1.10 *** php4/php.h:1.9 Wed Apr 21 15:39:21 1999 --- php4/php.h Wed Apr 21 19:27:59 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.9 1999/04/21 19:39:21 ssb Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.10 1999/04/21 23:27:59 ssb Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 41,52 **** --- 41,55 ---- #include "php_version.h" #include "zend.h" + + /* automake defines PACKAGE and VERSION for Zend too */ #ifdef PACKAGE # undef PACKAGE #endif #ifdef VERSION # undef VERSION #endif + #include "zend_API.h" Index: php4/setup diff -c php4/setup:1.6 php4/setup:1.7 *** php4/setup:1.6 Wed Apr 21 19:11:18 1999 --- php4/setup Wed Apr 21 19:27:59 1999 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.6 1999/04/21 23:11:18 ssb Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 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 *************** *** 350,359 **** define_option enable-debugger 'Enable PHP remote debugger?' yesno no \ " Whether to enable PHP remote debugging support. This feature\n is still under development." - - define_option enable-bcmath 'Enable bc style precision math functions' yesno \ - no \ - ' Enables bc style arbitrary precision math functions.' # configure.in only checks these if it's a cgi so setup does the same if test "$option_value_with_apache" = "no"; then --- 350,355 ---- Index: php4/tls.h diff -c php4/tls.h:1.2 php4/tls.h:1.3 *** php4/tls.h:1.2 Sat Apr 10 12:25:23 1999 --- php4/tls.h Wed Apr 21 19:27:59 1999 *************** *** 37,43 **** #include "alloc.h" #include "functions/head.h" ! #include "functions/number.h" #include "constants.h" #include <sys/stat.h> #if USE_SAPI --- 37,43 ---- #include "alloc.h" #include "functions/head.h" ! #include "ext/bcmath/number.h" #include "constants.h" #include <sys/stat.h> #if USE_SAPI -- PHP 4 Beta