[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 19:11 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv28092 Modified Files: Makefile.in acconfig.h.in configure.in.in setup Log Message: moved apache, com and hyperwave into ext/ Index: php4/Makefile.in diff -c php4/Makefile.in:1.14 php4/Makefile.in:1.15 *** php4/Makefile.in:1.14 Wed Apr 21 18:49:13 1999 --- php4/Makefile.in Wed Apr 21 19:11:18 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.14 1999/04/21 22:49:13 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.15 1999/04/21 23:11:18 ssb Exp $ # prefix = @prefix@ *************** *** 68,85 **** safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ php_ini.o ! FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ 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/COM.c functions/ifx.c \ ! functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.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 -Lext -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) --- 68,85 ---- safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ php_ini.o ! FUNCTIONS_SOURCE = functions/fhttpd.c \ 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 \ 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@ @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) Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.5 php4/acconfig.h.in:1.6 *** php4/acconfig.h.in:1.5 Wed Apr 21 18:49:13 1999 --- php4/acconfig.h.in Wed Apr 21 19:11:18 1999 *************** *** 64,72 **** #define REGEX 0 #define HSREGEX 0 - /* Define if you want Hyperwave support */ - #define HYPERWAVE 0 - /* Define if you have the crypt() function */ #define HAVE_CRYPT 1 --- 64,69 ---- Index: php4/configure.in.in diff -c php4/configure.in.in:1.9 php4/configure.in.in:1.10 *** php4/configure.in.in:1.9 Wed Apr 21 18:49:13 1999 --- php4/configure.in.in Wed Apr 21 19:11:18 1999 *************** *** 1,4 **** ! dnl $Id: configure.in.in,v 1.9 1999/04/21 22:49:13 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. --- 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. *************** *** 1150,1172 **** AC_SUBST(IBASE_LFLAGS) dnl## AC_SUBST(IBASE_INCLUDE) INCLUDES="$INCLUDES $IBASE_INCLUDE" - - - AC_MSG_CHECKING(for Hyperwave support) - AC_ARG_WITH(hyperwave, - [ --with-hyperwave Include Hyperwave support], - [ - if test "$withval" != "no"; then - AC_DEFINE(HYPERWAVE,1) - AC_MSG_RESULT(yes) - else - AC_DEFINE(HYPERWAVE,0) - AC_MSG_RESULT(no) - fi - ],[ - AC_DEFINE(HYPERWAVE,0) - AC_MSG_RESULT(no) - ]) AC_MSG_CHECKING(for XML support) --- 1150,1155 ---- Index: php4/setup diff -c php4/setup:1.5 php4/setup:1.6 *** php4/setup:1.5 Wed Apr 21 18:49:13 1999 --- php4/setup Wed Apr 21 19:11:18 1999 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.5 1999/04/21 22:49:13 ssb Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 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 *************** *** 265,274 **** 'no /usr/interbase InterBase base install' \ ' Whether to build PHP with InterBase support. More\n information about InterBase can be found at http://www.interbase.com/.' - - define_option with-hyperwave 'Hyperwave support?' yesno no \ - ' Whether to build with Hyperwave support. More\n - information about Hyperwave can be found at http://www.hyperwave.com.' define_option with-ldap 'LDAP support?' yesnodir \ 'no /usr/local/ldap LDAP base install' \ --- 265,270 ---- -- PHP 4 Beta