cvs: /php3/functions imsp.c imsp.h /php3 ChangeLog Makefile.in acconfig.h config.h.in configure.in internal_functions.c

chagenbu Fri Aug 6 12:09:25 1999 EDT Added files: /php3/functions imsp.c imsp.h Modified files: /php3 ChangeLog Makefile.in acconfig.h config.h.in configure.in internal_functions.c Log: Adding the IMSP module. I've been running it for a few weeks now locally and it should be stable. The only catch is that the library that you need to link against to use it - libimsp - isn't available yet in any kind of distributable form. I'm working on getting it released somewhere. It also requires c-client to compile, so the checks that are made for c-client in the IMAP section of configure.in should probably be moved to the IMSP section as well. Index: php3/ChangeLog diff -u php3/ChangeLog:1.737 php3/ChangeLog:1.738 --- php3/ChangeLog:1.737 Wed Aug 4 14:51:51 1999 +++ php3/ChangeLog Fri Aug 6 12:09:24 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Add IMSP module (Chuck Hagenbuch) - Add gd-1.6.x PNG functions (Rasmus from drew@elysium.ltd.uk) - Fix [s]printf 0-padding issues (Rasmus) - Fix a crash bug in number_format(), in case of very large numbers (Zeev) Index: php3/Makefile.in diff -u php3/Makefile.in:1.343 php3/Makefile.in:1.344 --- php3/Makefile.in:1.343 Mon Aug 2 13:48:26 1999 +++ php3/Makefile.in Fri Aug 6 12:09:24 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.343 1999/08/02 17:48:26 musone Exp $ +# $Id: Makefile.in,v 1.344 1999/08/06 16:09:24 chagenbu 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/php3_icap.c\ + functions/head.c functions/html.c functions/image.c functions/imap.c functions/imsp.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_icap.h functions/php3_aspell.h \ + functions/php3_mail.h functions/imap.h functions/imsp.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/imsp.o: functions/imsp.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/acconfig.h diff -u php3/acconfig.h:1.109 php3/acconfig.h:1.110 --- php3/acconfig.h:1.109 Thu Aug 5 07:15:57 1999 +++ php3/acconfig.h Fri Aug 6 12:09:24 1999 @@ -186,6 +186,9 @@ /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 +/* Define if you want the IMSP options/addressbook interface */ +#define HAVE_IMSP 0 + /* Define if you want the ASPELL interface */ #define HAVE_ASPELL 0 Index: php3/config.h.in diff -u php3/config.h.in:1.188 php3/config.h.in:1.189 --- php3/config.h.in:1.188 Thu Aug 5 07:15:57 1999 +++ php3/config.h.in Fri Aug 6 12:09:24 1999 @@ -233,6 +233,12 @@ /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 +/* Define if you want the IMSP options/addressbook */ +#define HAVE_IMSP 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.451 php3/configure.in:1.452 --- php3/configure.in:1.451 Mon Aug 2 13:48:26 1999 +++ php3/configure.in Fri Aug 6 12:09:24 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.451 1999/08/02 17:48:26 musone Exp $ +dnl $Id: configure.in,v 1.452 1999/08/06 16:09:24 chagenbu Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -656,6 +656,54 @@ fi AC_ADD_INCLUDE($IMAP_INC_DIR) AC_DEFINE(HAVE_IMAP) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) + +AC_MSG_CHECKING(for IMSP support) +AC_ARG_WITH(imsp, +[ --with-imsp[=DIR] Include IMSp support (DIR is IMSP's include dir and libimsp.a dir).], +[ + if test "$withval" = "yes"; then + if test -f /usr/local/include/imsp.h; then + withval=/usr/local + elif test -f /usr/include/imsp.h; then + withval=/usr + elif test -f /usr/include/imsp/imsp.h; then + withval=/usr + fi + fi + if test "$withval" != "no"; then + IMSP_DIR=$withval + if test -f $IMSP_DIR/include/imsp/mail.h; then + IMSP_INC_DIR=$IMSP_DIR/include/imsp + else + IMSP_INC_DIR=$withval/include + fi + + if test ! -f $IMSP_INC_DIR/imsp.h; then + AC_MSG_ERROR(could not find imsp.h in $IMSP_INC_DIR !) + fi + if test ! -f $IMSP_INC_DIR/support.h; then + AC_MSG_ERROR(could not find support.h in $IMSP_INC_DIR !) + fi + if test ! -f $IMSP_INC_DIR/imutil.h; then + AC_MSG_ERROR(could not find imutil.h in $IMSP_INC_DIR !) + fi + + if test -f "$IMSP_DIR/lib/libimsp.a" ; then + AC_ADD_LIBRARY_WITH_PATH(imsp, $IMSP_DIR/lib) + elif test -f "$IMSP_DIR/lib/imsp.a" ; then + EXTRA_LIBS="$EXTRA_LIBS $IMSP_DIR/lib/imsp.a" + else + AC_MSG_ERROR(Please copy or link $IMSP_DIR/lib/imsp.a to $IMSP_DIR/lib/libimsp.a) + fi + AC_ADD_INCLUDE($IMSP_INC_DIR) + AC_DEFINE(HAVE_IMSP) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.355 php3/internal_functions.c:1.356 --- php3/internal_functions.c:1.355 Mon Aug 2 13:48:26 1999 +++ php3/internal_functions.c Fri Aug 6 12:09:24 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.355 1999/08/02 17:48:26 musone Exp $ */ +/* $Id: internal_functions.c,v 1.356 1999/08/06 16:09:24 chagenbu 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/imsp.h" #include "functions/php3_icap.h" #include "functions/php3_aspell.h" #include "functions/md5.h" @@ -176,6 +177,7 @@ {"Zlib", php3_zlib_module_ptr}, {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, + {"IMSP", php3_imsp_module_ptr}, {"ICAP", php3_icap_module_ptr}, {"ASPELL", php3_aspell_module_ptr}, {"InterBase", php3_ibase_module_ptr},