cvs: /php3/functions php3_icap.c php3_icap.h /php3 Makefile.in config.h.in configure.in internal_functions.c

musone Mon Aug 2 13:48:27 1999 EDT Added files: /php3/functions php3_icap.c php3_icap.h Modified files: /php3 Makefile.in config.h.in configure.in internal_functions.c Log: Added preliminary icap support. Mark Index: php3/Makefile.in diff -u php3/Makefile.in:1.342 php3/Makefile.in:1.343 --- php3/Makefile.in:1.342 Tue Jul 13 09:43:01 1999 +++ php3/Makefile.in Mon Aug 2 13:48:26 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.342 1999/07/13 13:43:01 sas Exp $ +# $Id: Makefile.in,v 1.343 1999/08/02 17:48:26 musone Exp $ # prefix = @prefix@ @@ -79,7 +79,7 @@ functions/dl.c functions/dns.c functions/exec.c functions/file.c \ functions/filepro.c functions/filestat.c \ functions/formatted_print.c functions/fsock.c functions/gd.c \ - functions/head.c functions/html.c functions/image.c functions/imap.c \ + functions/head.c functions/html.c functions/image.c functions/imap.c functions/php3_icap.c\ functions/link.c functions/mail.c functions/math.c functions/iptc.c \ functions/md5.c functions/microtime.c functions/mime.c \ functions/msql.c functions/mysql.c \ @@ -292,7 +292,7 @@ functions/oracle.h functions/base64.h functions/php3_dir.h \ functions/dns.h functions/php3_pgsql.h functions/php3_velocis.h \ functions/php3_sybase.h functions/php3_sybase-ct.h functions/reg.h \ - functions/php3_mail.h functions/imap.h functions/php3_aspell.h \ + functions/php3_mail.h functions/imap.h functions/php3_icap.h functions/php3_aspell.h \ functions/md5.h functions/php3_global.h functions/php3_gd.h \ functions/html.h functions/dl.h functions/head.h functions/post.h \ functions/exec.h functions/php3_solid.h functions/adabasd.h \ @@ -474,6 +474,10 @@ mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ internal_functions.h modules.h functions/image.h functions/imap.o: functions/imap.c config.h php.h php_version.h request_info.h \ + php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \ + mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ + internal_functions.h modules.h +functions/php3_icap.o: functions/php3_icap.c config.h php.h php_version.h request_info.h \ php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \ mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \ internal_functions.h modules.h Index: php3/config.h.in diff -u php3/config.h.in:1.186 php3/config.h.in:1.187 --- php3/config.h.in:1.186 Thu Jul 29 14:40:17 1999 +++ php3/config.h.in Mon Aug 2 13:48:26 1999 @@ -232,6 +232,9 @@ /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 +/* Define if you want the ICAP interface */ +#define HAVE_ICAP 0 + /* Define if you want the ASPELL interface */ #define HAVE_ASPELL 0 Index: php3/configure.in diff -u php3/configure.in:1.450 php3/configure.in:1.451 --- php3/configure.in:1.450 Thu Jul 29 14:40:17 1999 +++ php3/configure.in Mon Aug 2 13:48:26 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.450 1999/07/29 18:40:17 markonen Exp $ +dnl $Id: configure.in,v 1.451 1999/08/02 17:48:26 musone Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -683,6 +683,28 @@ AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include) fi AC_DEFINE(HAVE_ASPELL) + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR(no) + fi +],[ + AC_MSG_RESULT(no) +]) + +AC_MSG_CHECKING(for ICAP support) +AC_ARG_WITH(icap, +[ --with-icap[=DIR] Include ICAP support.], +[ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + ICAP_DIR=/usr/local + else + ICAP_DIR=$withval + fi + + AC_ADD_INCLUDE($ICAP_DIR/) + AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR/) + AC_DEFINE(HAVE_ICAP) AC_MSG_RESULT(yes) else AC_MSG_ERROR(no) Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.354 php3/internal_functions.c:1.355 --- php3/internal_functions.c:1.354 Fri Jul 2 16:34:42 1999 +++ php3/internal_functions.c Mon Aug 2 13:48:26 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.354 1999/07/02 20:34:42 markonen Exp $ */ +/* $Id: internal_functions.c,v 1.355 1999/08/02 17:48:26 musone Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -67,6 +67,7 @@ #include "functions/reg.h" #include "functions/php3_mail.h" #include "functions/imap.h" +#include "functions/php3_icap.h" #include "functions/php3_aspell.h" #include "functions/md5.h" #include "functions/php3_gd.h" @@ -175,6 +176,7 @@ {"Zlib", php3_zlib_module_ptr}, {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, + {"ICAP", php3_icap_module_ptr}, {"ASPELL", php3_aspell_module_ptr}, {"InterBase", php3_ibase_module_ptr}, {"XML", xml_module_ptr},