CVS update: php3

Date: Monday January 11, 1999 @ 1:11 Author: musone Update of /repository/php3 In directory asf:/u/temp/cvs-serv26015 Modified Files: Makefile.in acconfig.h config.h.in configure.in internal_functions.c libphp3.module.in Log Message: added aspell support aspell_new - open dictionary aspell_check - return if word is valid aspell_check_raw - return if word is valid (case insensitive) aspell_suggest - return list of suggested spellings Index: php3/Makefile.in diff -c php3/Makefile.in:1.282 php3/Makefile.in:1.283 *** php3/Makefile.in:1.282 Tue Jan 5 20:32:52 1999 --- php3/Makefile.in Mon Jan 11 01:11:10 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.282 1999/01/06 01:32:52 sas Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.283 1999/01/11 06:11:10 musone Exp $ # prefix = @prefix@ *************** *** 37,43 **** AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ --- 37,43 ---- AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 66,79 **** request_info.o safe_mode.o fopen-wrappers.o constants.o \ php3_realpath.o alloca.o @LIBOBJS@ ! FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \ functions/basic_functions.c \ functions/crypt.c functions/datetime.c functions/db.c \ functions/dbase.c functions/dir.c \ 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/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 \ --- 66,79 ---- request_info.o safe_mode.o fopen-wrappers.o constants.o \ php3_realpath.o alloca.o @LIBOBJS@ ! FUNCTIONS_SOURCE = functions/adabasd.c functions/aspell.c functions/apache.c functions/fhttpd.c \ functions/basic_functions.c \ functions/crypt.c functions/datetime.c functions/db.c \ functions/dbase.c functions/dir.c \ 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/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 \ *************** *** 96,102 **** FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) --- 96,102 ---- FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) *************** *** 272,278 **** 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/md5.h \ functions/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 functions/file.h \ --- 272,278 ---- 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/md5.h \ functions/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 functions/file.h \ *************** *** 338,343 **** --- 338,347 ---- 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_string.h functions/head.h functions/adabasd.h + functions/aspell.o: functions/aspell.c php.h php_version.h config.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/apache.o: functions/apache.c php.h php_version.h config.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 \ Index: php3/acconfig.h diff -c php3/acconfig.h:1.75 php3/acconfig.h:1.76 *** php3/acconfig.h:1.75 Sun Dec 27 05:16:21 1998 --- php3/acconfig.h Mon Jan 11 01:11:10 1999 *************** *** 115,120 **** --- 115,123 ---- /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 + /* Define if you want the ASPELL interface */ + #define HAVE_ASPELL 0 + /* Define if you want to use a custom ODBC database driver */ #define HAVE_CODBC 0 Index: php3/config.h.in diff -c php3/config.h.in:1.130 php3/config.h.in:1.131 *** php3/config.h.in:1.130 Sun Dec 27 12:20:30 1998 --- php3/config.h.in Mon Jan 11 01:11:10 1999 *************** *** 161,166 **** --- 161,169 ---- /* Define if you want the IMAP directory interface */ #define HAVE_IMAP 0 + /* Define if you want the ASPELL interface */ + #define HAVE_ASPELL 0 + /* Define if you want to use a custom ODBC database driver */ #define HAVE_CODBC 0 Index: php3/configure.in diff -c php3/configure.in:1.298 php3/configure.in:1.299 *** php3/configure.in:1.298 Sun Dec 27 05:16:21 1998 --- php3/configure.in Mon Jan 11 01:11:10 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.298 1998/12/27 10:16:21 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.299 1999/01/11 06:11:10 musone Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 533,538 **** --- 533,562 ---- AC_MSG_RESULT(yes) else AC_MSG_ERROR(could not find imap library!) + fi + ],[ + AC_MSG_RESULT(no) + ]) + + + AC_MSG_CHECKING(for ASPELL support) + AC_ARG_WITH(aspell, + [ --with-aspell[=DIR] Include ASPELL support.], + [ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + ASPELL_DIR=/usr/local + else + ASPELL_DIR=$withval + fi + ASPELL_INCLUDE="-I$ASPELL_DIR/include/" + IMAP_LIBS=" -laspell " + AC_SUBST(ASPELL_INCLUDE) + AC_SUBST(ASPELL_LIBS) + AC_DEFINE(HAVE_ASPELL) + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR(could not find ASPELL library!) fi ],[ AC_MSG_RESULT(no) Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.336 php3/internal_functions.c:1.337 *** php3/internal_functions.c:1.336 Tue Jan 5 20:32:52 1999 --- php3/internal_functions.c Mon Jan 11 01:11:10 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.336 1999/01/06 01:32:52 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.337 1999/01/11 06:11:10 musone Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 66,71 **** --- 66,72 ---- #include "functions/reg.h" #include "functions/php3_mail.h" #include "functions/imap.h" + #include "functions/php3_aspell.h" #include "functions/md5.h" #include "functions/php3_gd.h" #include "functions/html.h" *************** *** 152,157 **** --- 153,159 ---- {"Zlib", php3_zlib_module_ptr}, {"Win32 COM", COM_module_ptr}, {"IMAP", php3_imap_module_ptr}, + {"ASPELL", php3_aspell_module_ptr}, {"InterBase", php3_ibase_module_ptr}, {"XML", xml_module_ptr}, {"PDF", pdf_module_ptr}, Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.16 php3/libphp3.module.in:1.17 *** php3/libphp3.module.in:1.16 Sun Nov 15 00:33:10 1998 --- php3/libphp3.module.in Mon Jan 11 01:11:10 1999 *************** *** 1,7 **** Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd --- 1,7 ---- Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net