[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 20:45 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv9547 Modified Files: Makefile.in acconfig.h.in configure.in.in internal_functions.c setup Log Message: moved imap and ldap Index: php4/Makefile.in diff -c php4/Makefile.in:1.18 php4/Makefile.in:1.19 *** php4/Makefile.in:1.18 Wed Apr 21 20:25:51 1999 --- php4/Makefile.in Wed Apr 21 20:45:13 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.18 1999/04/22 00:25:51 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.19 1999/04/22 00:45:13 ssb Exp $ # prefix = @prefix@ *************** *** 68,84 **** safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ 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) --- 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) Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.9 php4/acconfig.h.in:1.10 *** php4/acconfig.h.in:1.9 Wed Apr 21 20:25:51 1999 --- php4/acconfig.h.in Wed Apr 21 20:45:13 1999 *************** *** 58,74 **** #define REGEX 0 #define HSREGEX 0 - /* Define if you have the crypt() function */ - #define HAVE_CRYPT 1 - - /* Define if you want the LDAP directory interface */ - #define HAVE_LDAP 0 - /* Define if you want the SNMP interface */ #define HAVE_SNMP 0 - - /* Define if you want the IMAP directory interface */ - #define HAVE_IMAP 0 /* Define if you have libdl (used for dynamic linking) */ #define HAVE_LIBDL 0 --- 58,65 ---- Index: php4/configure.in.in diff -c php4/configure.in.in:1.13 php4/configure.in.in:1.14 *** php4/configure.in.in:1.13 Wed Apr 21 20:25:51 1999 --- php4/configure.in.in Wed Apr 21 20:45:13 1999 *************** *** 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. --- 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. *************** *** 792,836 **** # reading config stubs esyscmd(./scripts/config-stubs) - AC_MSG_CHECKING(for IMAP support) - AC_ARG_WITH(imap, - [ --with-imap[=DIR] Include IMAP support (DIR is the IMAP include dir and c-client.a dir).], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - IMAP_DIR=/usr/local - else - IMAP_DIR=$withval - fi - if test ! -f $IMAP_DIR/include/mail.h; then - AC_MSG_ERROR(could not find mail.h in $IMAP_DIR/include !) - fi - if test ! -f $IMAP_DIR/include/rfc822.h; then - AC_MSG_ERROR(could not find rfc822.h in $IMAP_DIR/include !) - fi - if test ! -f $IMAP_DIR/include/linkage.h; then - AC_MSG_ERROR(could not find linkage.h in $IMAP_DIR/include !) - fi - if test ! -f $IMAP_DIR/lib/c-client.a; then - AC_MSG_ERROR(could not find c-client.a in $IMAP_DIR/lib !) - fi - IMAP_INCLUDE="-I$IMAP_DIR/include/" - IMAP_LIBS="$IMAP_DIR/lib/c-client.a" - - dnl## AC_SUBST(IMAP_INCLUDE) - INCLUDES="$INCLUDES $IMAP_INCLUDE" - AC_SUBST(IMAP_LIBS) - LIBS="$LIBS $IMAP_LIBS" - AC_DEFINE(HAVE_IMAP) - AC_MSG_RESULT(yes) - else - AC_MSG_ERROR(could not find imap library!) - fi - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING(for Sybase support) AC_ARG_WITH(sybase, [ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home --- 792,797 ---- *************** *** 940,977 **** AC_SUBST(PGSQL_LFLAGS) dnl## AC_SUBST(PGSQL_INCLUDE) INCLUDES="$INCLUDES $PGSQL_INCLUDE" - - - AC_MSG_CHECKING(for LDAP support) - AC_ARG_WITH(ldap, - [ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base - install directory, defaults to /usr/local/ldap], - [ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - LDAP_INCDIR=/usr/local/ldap/include - LDAP_LIBDIR=/usr/local/ldap/lib - else - LDAP_INCDIR=$withval/include - LDAP_LIBDIR=$withval/lib - fi - LDAP_INCLUDE=-I$LDAP_INCDIR - LDAP_LFLAGS="-L$LDAP_LIBDIR ${ld_runpath_switch}$LDAP_LIBDIR" - LDAP_LIBS="-lldap -llber" - - AC_DEFINE(HAVE_LDAP) - - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - ],[ - AC_MSG_RESULT(no) - ]) - AC_SUBST(LDAP_LIBS) - AC_SUBST(LDAP_LFLAGS) - dnl## AC_SUBST(LDAP_INCLUDE) - INCLUDES="$INCLUDES $LDAP_INCLUDE" AC_MSG_CHECKING(for SNMP support) --- 901,906 ---- Index: php4/internal_functions.c diff -c php4/internal_functions.c:1.13 php4/internal_functions.c:1.14 *** php4/internal_functions.c:1.13 Wed Apr 21 20:25:51 1999 --- php4/internal_functions.c Wed Apr 21 20:45:13 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.13 1999/04/22 00:25:51 ssb Exp $ */ #include "php.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.14 1999/04/22 00:45:13 ssb Exp $ */ #include "php.h" *************** *** 47,53 **** #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" #include "ext/msql/php3_msql.h" --- 47,53 ---- #include "ext/gettext/php3_gettext.h" #include "ext/informix/php3_ifx.h" ! #include "ext/ldap/php3_ldap.h" #include "ext/mysql/php3_mysql.h" #include "ext/bcmath/php3_bcmath.h" #include "ext/msql/php3_msql.h" *************** *** 56,62 **** #include "functions/php3_pgsql.h" #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" --- 56,62 ---- #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" Index: php4/setup diff -c php4/setup:1.8 php4/setup:1.9 *** php4/setup:1.8 Wed Apr 21 20:25:51 1999 --- php4/setup Wed Apr 21 20:45:13 1999 *************** *** 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 --- 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 *************** *** 265,282 **** '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-ldap 'LDAP support?' yesnodir \ - 'no /usr/local/ldap LDAP base install' \ - ' Whether to build with LDAP (Lightweight Directory Access Protocol)\n - support.\n - More information about LDAP can be found in RFC1777 and RFC1778.' - - define_option with-imap 'IMAP support?' yesnodir \ - 'no /usr/local/imap IMAP base install' \ - ' Whether to build with IMAP (Internet Message Access Protocol)\n - support.\n - More information about LDAP can be found in RFC1777 and RFC1778.' define_option with-pdflib 'pdflib 0.6 support? ' yesnodir \ 'no /usr/local pdflib install' \ --- 265,270 ---- -- PHP 4 Beta