[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 22:48 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv8480 Modified Files: Makefile.in acconfig.h.in acinclude.m4 configure.in.in internal_functions.c main.c setup Added Files: fhttpd.c Log Message: last bunch of extensions moving to ext/ fhttpd module taken out of functions, functions is ready to go. The only extensions I have tested are gd+freetype and odbc(solid). Please try compiling in your favourite extensions and let me know how it works. Index: php4/Makefile.in diff -c php4/Makefile.in:1.19 php4/Makefile.in:1.20 *** php4/Makefile.in:1.19 Wed Apr 21 20:45:13 1999 --- php4/Makefile.in Wed Apr 21 22:48:22 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.19 1999/04/22 00:45:13 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.20 1999/04/22 02:48:22 ssb Exp $ # prefix = @prefix@ *************** *** 68,82 **** safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ php_ini.o - FUNCTIONS_SOURCE = functions/fhttpd.c functions/mime.c \ - functions/pgsql.c functions/post.c functions/sybase.c \ - functions/sybase-ct.c functions/xml.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@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) --- 68,75 ---- safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ php_ini.o PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext ! LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@ all: $(BINNAME) *************** *** 90,101 **** done && test -z "$$fail" # CGI binary or fhttpd module ! php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ ! $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS) # Apache modules ! libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS) ! $(AR) $@.tmp $(OBJS) $(FUNCTIONS) $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @rm -f $@.tmp $(RANLIB) $(BINNAME) --- 83,94 ---- done && test -z "$$fail" # CGI binary or fhttpd module ! php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ ! $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) # Apache modules ! libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) ! $(AR) $@.tmp $(OBJS) $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @rm -f $@.tmp $(RANLIB) $(BINNAME) *************** *** 118,124 **** clean: clean-recursive -rm -f libphp3.a libmodphp3.a php *.o - -rm -f $(FUNCTIONS) functions/ifx.c -rm -f test/php.desc test/php.in test/php.out test/php.test -rm -f test/a.tmp test/b.tmp test/test.dbm* --- 111,116 ---- *************** *** 171,187 **** -T pval -T HashTable -T Bucket -T Token -T TokenCache -T TokenCacheManager \ -T switch_expr -T internal_function -T control_structure_data \ -T MemoryHashTable -T MemoryBucket \ ! -T pvalue_value -T Stack *.c *.h functions/*.c functions/*.h ! rm -f *~ functions/*~ .c.o: @rm -f $@ $(CC) $(CFLAGS) -c $< -o $@ - @bn=echo $@ | sed -e 's#functions/##'; test -f $@ || \ - (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@) - - functions/number.o: functions/number.c - $(CC) $(CFLAGS) -w$(WARNING_LEVEL) -c $< -o $@ @bn=echo $@ | sed -e 's#functions/##'; test -f $@ || \ (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@) --- 163,174 ---- -T pval -T HashTable -T Bucket -T Token -T TokenCache -T TokenCacheManager \ -T switch_expr -T internal_function -T control_structure_data \ -T MemoryHashTable -T MemoryBucket \ ! -T pvalue_value -T Stack *.c *.h ! rm -f *~ .c.o: @rm -f $@ $(CC) $(CFLAGS) -c $< -o $@ @bn=echo $@ | sed -e 's#functions/##'; test -f $@ || \ (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@) Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.10 php4/acconfig.h.in:1.11 *** php4/acconfig.h.in:1.10 Wed Apr 21 20:45:13 1999 --- php4/acconfig.h.in Wed Apr 21 22:48:22 1999 *************** *** 21,32 **** /* type check for in_addr_t */ #undef in_addr_t - /* crypt capability checks */ - #undef PHP3_STD_DES_CRYPT - #undef PHP3_EXT_DES_CRYPT - #undef PHP3_MD5_CRYPT - #undef PHP3_BLOWFISH_CRYPT - /* Define if you have dirent.h but opendir() resides in libc rather than in libdir */ /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */ #define HAVE_DIRENT_H 0 --- 21,26 ---- *************** *** 34,42 **** /* Define if you have the resolv library (-lresolv). */ #define HAVE_LIBRESOLV 0 - /* Define if you have the zlib library */ - #define HAVE_ZLIB 0 - /* Define if you want safe mode enabled by default. */ #define PHP_SAFE_MODE 0 --- 28,33 ---- *************** *** 58,75 **** #define REGEX 0 #define HSREGEX 0 - /* Define if you want the SNMP interface */ - #define HAVE_SNMP 0 - - /* Define if you have libdl (used for dynamic linking) */ - #define HAVE_LIBDL 0 - - /* Define if you have libdnet_stub (used for Sybase support) */ - #define HAVE_LIBDNET_STUB 0 - - /* Define if you have and want to use libcrypt */ - #define HAVE_LIBCRYPT 0 - /* Define if you have and want to use libnsl */ #define HAVE_LIBNSL 0 --- 49,54 ---- *************** *** 97,127 **** /* Define if your Apache has src/include/ap_compat.h */ #define HAVE_AP_COMPAT_H 0 - #define HAVE_SYBASE 0 - #define HAVE_SYBASE_CT 0 - - #ifndef HAVE_PGSQL - #define HAVE_PGSQL 0 - #endif - - #ifndef HAVE_IFX - #define HAVE_IFX 0 - #endif - #ifndef HAVE_IFX_IUS - #define HAVE_IFX_IUS 0 - #endif - #ifndef IFX_VERSION - #define IFX_VERSION 0 - #endif - - #ifndef HAVE_IBASE - #define HAVE_IBASE 0 - #endif - - #ifndef HAVE_PQCMDTUPLES - #define HAVE_PQCMDTUPLES 0 - #endif - #ifndef DEBUG /* should be set to ZEND_DEBUG */ #define DEBUG 0 #endif --- 76,81 ---- *************** *** 149,175 **** */ #define PHP3_URL_FOPEN 0 - /* Define if you want System V semaphore support. - */ - #define HAVE_SYSVSEM 0 - - /* Define if you have union semun. - */ - #define HAVE_SEMUN 0 - - /* Define if you want System V shared memory support. - */ - #define HAVE_SYSVSHM 0 - - /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 /* 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 --- 103,110 ---- Index: php4/acinclude.m4 diff -c php4/acinclude.m4:1.5 php4/acinclude.m4:1.6 *** php4/acinclude.m4:1.5 Wed Apr 21 19:37:46 1999 --- php4/acinclude.m4 Wed Apr 21 22:48:22 1999 *************** *** 1,4 **** ! dnl $Id: acinclude.m4,v 1.5 1999/04/21 23:37:46 ssb Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: acinclude.m4,v 1.6 1999/04/22 02:48:22 ssb Exp $ dnl dnl This file contains local autoconf functions. *************** *** 30,132 **** ],[ AC_DEFINE(BROKEN_SPRINTF,0) AC_MSG_RESULT(cannot check, guessing ok) - ]) - ]) - - dnl - dnl Check for crypt() capabilities - dnl - AC_DEFUN(AC_CRYPT_CAP,[ - - AC_MSG_CHECKING([for standard DES crypt]) - AC_TRY_RUN([ - main() { - #if HAVE_CRYPT - exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); - #else - exit(0); - #endif - }],[ - AC_DEFINE(PHP3_STD_DES_CRYPT,1) - AC_MSG_RESULT(yes) - ],[ - AC_DEFINE(PHP3_STD_DES_CRYPT,0) - AC_MSG_RESULT(no) - ],[ - AC_DEFINE(PHP3_STD_DES_CRYPT,1) - AC_MSG_RESULT(cannot check, guessing yes) - ]) - - AC_MSG_CHECKING([for extended DES crypt]) - AC_TRY_RUN([ - main() { - #if HAVE_CRYPT - exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); - #else - exit(0); - #endif - }],[ - AC_DEFINE(PHP3_EXT_DES_CRYPT,1) - AC_MSG_RESULT(yes) - ],[ - AC_DEFINE(PHP3_EXT_DES_CRYPT,0) - AC_MSG_RESULT(no) - ],[ - AC_DEFINE(PHP3_EXT_DES_CRYPT,0) - AC_MSG_RESULT(cannot check, guessing no) - ]) - - AC_MSG_CHECKING([for MD5 crypt]) - AC_TRY_RUN([ - main() { - #if HAVE_CRYPT - char salt[15], answer[40]; - - salt[0]='$'; salt[1]='1'; salt[2]='$'; - salt[3]='r'; salt[4]='a'; salt[5]='s'; - salt[6]='m'; salt[7]='u'; salt[8]='s'; - salt[9]='l'; salt[10]='e'; salt[11]='$'; - salt[12]='\0'; - strcpy(answer,salt); - strcat(answer,"rISCgZzpwk3UhDidwXvin0"); - exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); - #else - exit(0); - #endif - }],[ - AC_DEFINE(PHP3_MD5_CRYPT,1) - AC_MSG_RESULT(yes) - ],[ - AC_DEFINE(PHP3_MD5_CRYPT,0) - AC_MSG_RESULT(no) - ],[ - AC_DEFINE(PHP3_MD5_CRYPT,0) - AC_MSG_RESULT(cannot check, guessing no) - ]) - - AC_MSG_CHECKING([for Blowfish crypt]) - AC_TRY_RUN([ - main() { - #if HAVE_CRYPT - char salt[25], answer[70]; - - salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; - strcat(salt,"rasmuslerd"); - strcpy(answer,salt); - strcpy(&answer[16],"O............gl95GkTKn53Of.H4YchXl5PwvvW.5ri"); - exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); - #else - exit(0); - #endif - }],[ - AC_DEFINE(PHP3_BLOWFISH_CRYPT,1) - AC_MSG_RESULT(yes) - ],[ - AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) - AC_MSG_RESULT(no) - ],[ - AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) - AC_MSG_RESULT(cannot check, guessing no) ]) ]) --- 30,35 ---- Index: php4/configure.in.in diff -c php4/configure.in.in:1.14 php4/configure.in.in:1.15 *** php4/configure.in.in:1.14 Wed Apr 21 20:45:13 1999 --- php4/configure.in.in Wed Apr 21 22:48:22 1999 *************** *** 1,4 **** ! dnl $Id: configure.in.in,v 1.14 1999/04/22 00:45:13 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. --- 1,4 ---- ! dnl $Id: configure.in.in,v 1.15 1999/04/22 02:48:22 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. *************** *** 169,181 **** LIBS="-lcrypt $LIBS" AC_DEFINE(HAVE_LIBCRYPT) ], []) ]) - AC_CHECK_LIB(c, dlopen, [ - # fake it - AC_DEFINE(HAVE_LIBDL) ], [ - AC_CHECK_LIB(dl, dlopen, [ - LIBS="-ldl $LIBS" - AC_DEFINE(HAVE_LIBDL) ], []) ]) - dnl The sin may be in a library which need not be specifed dnl as well as res_search resides in libsocket AC_CHECK_LIB(c, sin, [:], [ --- 169,174 ---- *************** *** 263,270 **** AC_DEFINE(in_addr_t, u_int) fi - AC_CRYPT_CAP - divert(2) AC_MSG_CHECKING(whether to use bundled regex library) --- 256,261 ---- *************** *** 295,301 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" --- 286,292 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" *************** *** 792,1110 **** # reading config stubs esyscmd(./scripts/config-stubs) - AC_MSG_CHECKING(for Sybase support) - AC_ARG_WITH(sybase, - [ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home - directory, defaults to /home/sybase.], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - SYBASE_INCDIR=/home/sybase/include - SYBASE_LIBDIR=/home/sybase/lib - else - SYBASE_INCDIR=$withval/include - SYBASE_LIBDIR=$withval/lib - fi - SYBASE_INCLUDE=-I$SYBASE_INCDIR - SYBASE_LFLAGS="-L$SYBASE_LIBDIR -L$SYBASE_LIBDIR" - SYBASE_LIBS=-lsybdb - AC_MSG_RESULT(yes) - AC_CHECK_LIB(dnet_stub, dnet_addr, - [ SYBASE_LIBS="$SYBASE_LIBS -ldnet_stub" - AC_DEFINE(HAVE_LIBDNET_STUB) - ]) - AC_DEFINE(HAVE_SYBASE) - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(SYBASE_LIBS) - AC_SUBST(SYBASE_LFLAGS) - dnl## AC_SUBST(SYBASE_INCLUDE) - INCLUDES="$INCLUDES $SYBASE_INCLUDE" - - AC_MSG_CHECKING(for Sybase-CT support) - AC_ARG_WITH(sybase-ct, - [ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home - directory, defaults to /home/sybase.], - [ - if test "$withval" != "no"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SYBASE_CT) - if test "$withval" = "yes"; then - SYBASE_CT_INCDIR=/home/sybase/include - SYBASE_CT_LIBDIR=/home/sybase/lib - else - SYBASE_CT_INCDIR=$withval/include - SYBASE_CT_LIBDIR=$withval/lib - fi - SYBASE_CT_INCLUDE=-I$SYBASE_CT_INCDIR - SYBASE_CT_LFLAGS="-L$SYBASE_CT_LIBDIR" - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" - old_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" - AC_CHECK_LIB(tcl, netg_errstr, - [ SYBASE_CT_LIBS="$SYBASE_CT_LIBS -ltcl" ], - [ SYBASE_CT_LIBS="$SYBASE_CT_LIBS -lsybtcl" ], - [ $SYBASE_CT_LIBS ]) - AC_CHECK_LIB(insck, insck__getVdate, - [ SYBASE_CT_LIBS="$SYBASE_CT_LIBS -linsck" ]) - LDFLAGS=$old_LDFLAGS - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(SYBASE_CT_LIBS) - AC_SUBST(SYBASE_CT_LFLAGS) - dnl## AC_SUBST(SYBASE_CT_INCLUDE) - INCLUDES="$INCLUDES $SYBASE_CT_INCLUDE" - - - AC_MSG_CHECKING(for PostgresSQL support) - AC_ARG_WITH(pgsql, - [ --with-pgsql[=DIR] Include PostgresSQL support. DIR is the PostgresSQL - base install directory, defaults to /usr/local/pgsql.], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - PGSQL_INCDIR=/usr/local/pgsql/include - PGSQL_LIBDIR=/usr/local/pgsql/lib - else - PGSQL_INCDIR=$withval/include - test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql - PGSQL_LIBDIR=$withval/lib - test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql - fi - PGSQL_INCLUDE=-I$PGSQL_INCDIR - PGSQL_LFLAGS=-L$PGSQL_LIBDIR - PGSQL_LIBS=-lpq - - old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS; old_LIBS=$LIBS - CFLAGS="$CFLAGS $PGSQL_INCLUDE" - LDFLAGS="$LDFLAGS $PGSQL_LFLAGS" - LIBS="$LIBS $PGSQL_LIBS" - AC_DEFINE(HAVE_PGSQL) - AC_MSG_RESULT(yes) - AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES)) - CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(PGSQL_LIBS) - AC_SUBST(PGSQL_LFLAGS) - dnl## AC_SUBST(PGSQL_INCLUDE) - INCLUDES="$INCLUDES $PGSQL_INCLUDE" - - - AC_MSG_CHECKING(for SNMP support) - AC_ARG_WITH(snmp, - [ --with-snmp[=DIR] Include SNMP support. DIR is the SNMP base - install directory, defaults to /usr/local], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - SNMP_INCDIR=/usr/local/include - test -d /usr/local/include/ucd-snmp && SNMP_INCDIR=/usr/local/include/ucd-snmp - SNMP_LIBDIR=/usr/local/lib - else - SNMP_INCDIR=$withval/include - test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp - SNMP_LIBDIR=$withval/lib - fi - SNMP_INCLUDE=-I$SNMP_INCDIR - SNMP_LFLAGS=-L$SNMP_LIBDIR - SNMP_LIBS="-lsnmp" - - AC_DEFINE(HAVE_SNMP) - - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(SNMP_LIBS) - AC_SUBST(SNMP_LFLAGS) - dnl## AC_SUBST(SNMP_INCLUDE) - INCLUDES="$INCLUDES $SNMP_INCLUDE" - - - AC_MSG_CHECKING(for InterBase support) - AC_ARG_WITH(interbase, - [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base - install directory, defaults to /usr/interbase], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - IBASE_INCDIR=/usr/interbase/include - IBASE_LIBDIR=/usr/interbase/lib - else - IBASE_INCDIR=$withval/include - IBASE_LIBDIR=$withval/lib - fi - IBASE_INCLUDE=-I$IBASE_INCDIR - IBASE_LFLAGS=-L$IBASE_LIBDIR - IBASE_LIBS="-lgds" - - AC_DEFINE(HAVE_IBASE) - - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(IBASE_LIBS) - AC_SUBST(IBASE_LFLAGS) - dnl## AC_SUBST(IBASE_INCLUDE) - INCLUDES="$INCLUDES $IBASE_INCLUDE" - - - 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) - AC_ARG_WITH(zlib, - [ --with-zlib[=DIR] Include zlib support (requires zlib >= 1.0.9). - DIR is the zlib install directory, - defaults to /usr.], - [ - case "$withval" in - no) - AC_MSG_RESULT(no) ;; - yes) - AC_MSG_RESULT(yes) - AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB) ZLIB_LIBS="-lz"], - [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)]) ;; - *) - test -f $withval/include/zlib/zlib.h && ZLIB_INCLUDE="-I$withval/include/zlib" - test -f $withval/include/zlib.h && ZLIB_INCLUDE="-I$withval/include" - if test -n "$ZLIB_INCLUDE" ; then - AC_MSG_RESULT(yes) - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB) ZLIB_LIBS="-L$withval/lib -lz"], - [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)]) - LIBS=$old_LIBS - else - AC_MSG_RESULT(no) - fi ;; - esac - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(ZLIB_LIBS) - dnl## AC_SUBST(ZLIB_INCLUDE) - INCLUDES="$INCLUDES $ZLIB_INCLUDE" - - - AC_MSG_CHECKING(whether to include pdflib support) - AC_ARG_WITH(pdflib, - [ --with-pdflib[=DIR] Include pdflib support (tested with 0.6). - DIR is the pdflib install directory, - defaults to /usr/local.], - [ - case "$withval" in - no) - AC_MSG_RESULT(no) ;; - yes) - AC_MSG_RESULT(yes) - AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-lpdf"], - [AC_MSG_ERROR(pdflib module requires pdflib 0.6)]) ;; - *) - test -f $withval/include/pdf.h && PDFLIB_INCLUDE="-I$withval/include" - if test -n "$PDFLIB_INCLUDE" ; then - AC_MSG_RESULT(yes) - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-L$withval/lib -lpdf"], - [AC_MSG_ERROR(pdflib module requires pdflib 0.6.)]) - LIBS=$old_LIBS - else - AC_MSG_RESULT(no) - fi ;; - esac - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(PDFLIB_LIBS) - dnl## AC_SUBST(PDFLIB_INCLUDE) - INCLUDES="$INCLUDES $PDFLIB_INCLUDE" - - - AC_MSG_CHECKING(whether to enable System V semaphore support) - AC_ARG_ENABLE(sysvsem, - [ --enable-sysvsem Enable System V semaphore support.], - [ - if test "$enableval" = "yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SYSVSEM, 1) - AC_CACHE_CHECK(for union semun,php_cv_semun, - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/ipc.h> - #include <sys/sem.h> - ], - [union semun x;], - [ - php_cv_semun=yes - ],[ - php_cv_semun=no - ]) - ) - if test $php_cv_semun = "yes"; then - AC_DEFINE(HAVE_SEMUN, 1) - else - AC_DEFINE(HAVE_SEMUN, 0) - fi - else - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_SYSVSEM, 0) - fi - ],[ - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_SYSVSEM, 0) - ]) - - AC_MSG_CHECKING(whether to enable System V shared memory support) - AC_ARG_ENABLE(sysvshm, - [ --enable-sysvshm Enable the System V shared memory support],[ - if test "$enableval" = "yes"; then - AC_DEFINE(HAVE_SYSVSHM, 1) - AC_MSG_RESULT(yes) - else - AC_DEFINE(HAVE_SYSVSHM, 0) - AC_MSG_RESULT(no) - fi - ],[ - AC_DEFINE(HAVE_SYSVSHM, 0) - AC_MSG_RESULT(no) - ]) - - divert(4) dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. --- 783,789 ---- *************** *** 1126,1136 **** AC_SUBST(CFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB_EXPORT) - - dnl Create the necessary directories if building using VPATH - if test ! -d functions; then - mkdir functions - fi PHP_BUILD_DATE=date '+%Y-%m-%d' AC_SUBST(PHP_BUILD_DATE) --- 805,810 ---- Index: php4/internal_functions.c diff -c php4/internal_functions.c:1.14 php4/internal_functions.c:1.15 *** php4/internal_functions.c:1.14 Wed Apr 21 20:45:13 1999 --- php4/internal_functions.c Wed Apr 21 22:48:22 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.14 1999/04/22 00:45:13 ssb Exp $ */ #include "php.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.15 1999/04/22 02:48:22 ssb Exp $ */ #include "php.h" *************** *** 53,76 **** #include "ext/msql/php3_msql.h" #include "ext/oracle/php3_oci8.h" #include "ext/oracle/oracle.h" ! #include "functions/php3_pgsql.h" ! #include "functions/php3_sybase.h" ! #include "functions/php3_sybase-ct.h" #include "ext/imap/imap.h" #include "ext/standard/head.h" ! #include "functions/post.h" #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" #include "ext/db/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" #include "ext/fdf/php3_fdf.h" ! #include "functions/php3_sysvsem.h" ! #include "functions/php3_sysvshm.h" #include "ext/dav/php3_dav.h" unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE }; --- 53,76 ---- #include "ext/msql/php3_msql.h" #include "ext/oracle/php3_oci8.h" #include "ext/oracle/oracle.h" ! #include "ext/pgsql/php3_pgsql.h" ! #include "ext/sybase/php3_sybase.h" ! #include "ext/sybase/php3_sybase-ct.h" #include "ext/imap/imap.h" #include "ext/standard/head.h" ! #include "ext/standard/post.h" #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" #include "ext/db/db.h" #include "dl/snmp/php3_snmp.h" ! #include "ext/zlib/php3_zlib.h" #include "ext/com/php3_COM.h" ! #include "ext/interbase/php3_interbase.h" ! #include "ext/xml/php3_xml.h" ! #include "ext/pdf/php3_pdf.h" #include "ext/fdf/php3_fdf.h" ! #include "ext/sysvsem/php3_sysvsem.h" ! #include "ext/sysvshm/php3_sysvshm.h" #include "ext/dav/php3_dav.h" unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE }; Index: php4/main.c diff -c php4/main.c:1.22 php4/main.c:1.23 *** php4/main.c:1.22 Wed Apr 21 20:25:51 1999 --- php4/main.c Wed Apr 21 22:48:22 1999 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.22 1999/04/22 00:25:51 ssb Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.23 1999/04/22 02:48:22 ssb Exp $ */ /* #define CRASH_DETECTION */ *************** *** 68,75 **** #include "control_structures.h" #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> --- 68,73 ---- Index: php4/setup diff -c php4/setup:1.9 php4/setup:1.10 *** php4/setup:1.9 Wed Apr 21 20:45:13 1999 --- php4/setup Wed Apr 21 22:48:22 1999 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.9 1999/04/22 00:45: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.10 1999/04/22 02:48:22 ssb Exp $ if [ "$1" = "-q" ]; then quiet_mode=on *************** *** 238,287 **** for stub in ext/*/setup.stub; do test -f $stub && . $stub done - - define_option with-sybase 'Sybase support?' yesnodir \ - 'no /home/sybase Sybase install' \ - ' Whether to build PHP with Sybase support (DBLib only).\n - More info about Sybase can be found at http://www.sybase.com/.' - - define_option with-sybase-ct 'Sybase-CT support?' yesnodir \ - 'no /home/sybase Sybase-CT install' \ - ' Whether to build PHP with Sybase-CT support.' - - define_option with-pgsql 'PostgreSQL support?' yesnodir \ - 'no /usr/local/pgsql PostgreSQL base install' \ - ' Whether to build PHP with PostgreSQL support.\n - More info about PostgreSQL can be found at\n - http://www.postgreSQL.org/.' - - define_option with-informix 'Informix support?' yesnodir \ - "no $INFORMIXDIR Informix home" \ - ' Whether to build PHP with Informix support. If you have not set up your\n - Informix environment, enter what $INFORMIXDIR is usually set to here.\n - You MUST set $INFORMIXDIR before trying to compile!\n - More info about Informix can be found at http://www.informix.com/.' - - define_option with-interbase 'InterBase support?' yesnodir \ - '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-pdflib 'pdflib 0.6 support? ' yesnodir \ - 'no /usr/local pdflib install' \ - ' Whether to use the pdflib support to write .pdf-files.\n - Tested for version 0.6!' - - define_option with-zlib 'zlib (>= 1.0.9) support? ' yesnodir \ - 'no /usr zlib install' \ - ' Whether to use the zlib support to read/write .gz-files.\n - Requires zlib version >= 1.0.9!' - - define_option enable-sysvshm 'System V shared memory support? ' yesno no \ - ' Whether to use the System V shared memory (currently only solaris and linux).' - - define_option enable-sysvsem 'System V semaphores support? ' yesno no \ - ' Whether to use the System V semaphores (currently only solaris and linux).' - define_option with-config-file-path 'Default config directory?' yesnodir \ 'no /usr/local/lib Configuration file' \ --- 238,243 ---- -- PHP 4 Beta