cvs: php4 /ext/pspell Makefile.in README config.m4 php_pspell.h pspell.c

vlad Thu Jul 13 13:39:15 2000 EDT Modified files: /php4/ext/pspell Makefile.in README config.m4 php_pspell.h pspell.c Log: - Making pspell compile as a shared module - fix a couple typos @ Making pspell compile as a shared module Index: php4/ext/pspell/Makefile.in diff -u php4/ext/pspell/Makefile.in:1.1 php4/ext/pspell/Makefile.in:1.2 --- php4/ext/pspell/Makefile.in:1.1 Mon Jul 10 14:29:19 2000 +++ php4/ext/pspell/Makefile.in Thu Jul 13 13:39:14 2000 @@ -1,5 +1,7 @@ -LTLIBRARY_NAME = libpspell.la -LTLIBRARY_SOURCES = pspell.c +LTLIBRARY_NAME = libpspell.la +LTLIBRARY_SOURCES = pspell.c +LTLIBRARY_SHARED_NAME = pspell.la +LTLIBRARY_SHARED_LIBADD = $(PSPELL_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/pspell/README diff -u php4/ext/pspell/README:1.1 php4/ext/pspell/README:1.2 --- php4/ext/pspell/README:1.1 Mon Jul 10 14:29:19 2000 +++ php4/ext/pspell/README Thu Jul 13 13:39:14 2000 @@ -12,7 +12,7 @@ General notes ------------- -Plese, note that somewhere around version .27.x (I believe) aspell stopped +Please, note that somewhere around version .27.x (I believe) aspell stopped working with the aspell module for php. This is due to the fact that the author changed things around a bit, and suggested that people link to pspell in the future rather than to aspell. That's exactly what this module is for. Index: php4/ext/pspell/config.m4 diff -u php4/ext/pspell/config.m4:1.1 php4/ext/pspell/config.m4:1.2 --- php4/ext/pspell/config.m4:1.1 Mon Jul 10 14:29:19 2000 +++ php4/ext/pspell/config.m4 Thu Jul 13 13:39:14 2000 @@ -1,28 +1,28 @@ -dnl $Id: config.m4,v 1.1 2000/07/10 21:29:19 vlad Exp $ +dnl $Id: config.m4,v 1.2 2000/07/13 20:39:14 vlad Exp $ -AC_MSG_CHECKING(for PSPELL support) -AC_ARG_WITH(pspell, -[ --with-pspell[=DIR] Include PSPELL support.], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - PSPELL_DIR=/usr/local - else - PSPELL_DIR=$withval - fi +PHP_ARG_WITH(pspell,whether to include pspell support, +[ --with-pspell[=DIR] Include PSPELL support.]) - AC_ADD_INCLUDE($PSPELL_DIR/include) - AC_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_DIR/lib) +if test "$PHP_PSPELL" != "no"; then + PHP_EXTENSION(pspell, $ext_shared) + for i in /usr/local /usr $PHP_PSPELL; do + if test -f $i/include/pspell/pspell.h; then + PSPELL_DIR=$i + PSPELL_INCDIR=$i/include/pspell + elif test -f $i/include/pspell.h; then + PSPELL_DIR=$i + PSPELL_INCDIR=$i + fi + done - if test ! -f "$PSPELL_DIR/include/pspell/pspell.h"; then - AC_MSG_ERROR(Could not find pspell.h in $PSPELL_DIR/include/pspell - please copy it manually from the pspell sources to $PSPELL_DIR/include/pspell) - fi - AC_DEFINE(HAVE_PSPELL,1,[Whether you have pspell]) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pspell) - else - AC_MSG_ERROR(no) - fi -],[ - AC_MSG_RESULT(no) -]) + if test -z "$PSPELL_DIR"; then + AC_MSG_ERROR(Cannot find pspell) + fi + + PSPELL_LIBDIR=$PSPELL_DIR/lib + + AC_DEFINE(HAVE_PSPELL,1,[ ]) + PHP_SUBST(PSPELL_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) + AC_ADD_INCLUDE($PSPELL_INCDIR) +fi Index: php4/ext/pspell/php_pspell.h diff -u php4/ext/pspell/php_pspell.h:1.1 php4/ext/pspell/php_pspell.h:1.2 --- php4/ext/pspell/php_pspell.h:1.1 Mon Jul 10 14:29:19 2000 +++ php4/ext/pspell/php_pspell.h Thu Jul 13 13:39:14 2000 @@ -23,11 +23,11 @@ | If you did not, or have any questions about PHP licensing, please | | contact core@php.net. | +----------------------------------------------------------------------+ - | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | + | Authors: Vlad Krupin <phpdevel@echospace.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_pspell.h,v 1.1 2000/07/10 21:29:19 vlad Exp $ */ +/* $Id: php_pspell.h,v 1.2 2000/07/13 20:39:14 vlad Exp $ */ #ifndef _PSPELL_H @@ -36,9 +36,8 @@ extern zend_module_entry pspell_module_entry; #define pspell_module_ptr &pspell_module_entry -extern PHP_MINIT_FUNCTION(pspell); -extern PHP_MINFO_FUNCTION(pspell); - +PHP_MINIT_FUNCTION(pspell); +PHP_MINFO_FUNCTION(pspell); PHP_FUNCTION(pspell_new); PHP_FUNCTION(pspell_mode); PHP_FUNCTION(pspell_runtogether); Index: php4/ext/pspell/pspell.c diff -u php4/ext/pspell/pspell.c:1.2 php4/ext/pspell/pspell.c:1.3 --- php4/ext/pspell/pspell.c:1.2 Mon Jul 10 16:18:27 2000 +++ php4/ext/pspell/pspell.c Thu Jul 13 13:39:14 2000 @@ -16,13 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.2 2000/07/10 23:18:27 vlad Exp $ */ +/* $Id: pspell.c,v 1.3 2000/07/13 20:39:14 vlad Exp $ */ +#define IS_EXT_MODULE + #include "php.h" -#ifdef COMPILE_DL_PSPELL -#include "phpdl.h" -#endif #include <stdlib.h> #include <ctype.h> #include <stdio.h>