Index: config.m4
===================================================================
RCS file: /repository/php4/ext/pspell/config.m4,v
retrieving revision 1.6
diff -u -r1.6 config.m4
--- config.m4	30 Nov 2001 18:59:53 -0000	1.6
+++ config.m4	2 Apr 2002 10:58:47 -0000
@@ -16,9 +16,24 @@
 		if test -f $i/include/pspell/pspell.h; then
 			PSPELL_DIR=$i
 			PSPELL_INCDIR=$i/include/pspell
+			AC_MSG_CHECKING([for aspell.h])
+dnl This is never placed in $i/include/pspell
+			if test -f $i/include/aspell.h; then
+				AC_MSG_RESULT(yes)
+				NEW_ASPELL=1
+			else
+				AC_MSG_RESULT(no)
+			fi
 		elif test -f $i/include/pspell.h; then
 			PSPELL_DIR=$i
 			PSPELL_INCDIR=$i/include
+			AC_MSG_CHECKING([for aspell.h])
+			if test -f $i/include/aspell.h; then
+				AC_MSG_RESULT(yes)
+				NEW_ASPELL=1
+			else
+				AC_MSG_RESULT(no)
+			fi
 		fi
 	done
 
@@ -27,9 +42,32 @@
 	fi
 
 	PSPELL_LIBDIR=$PSPELL_DIR/lib
-
+	if test x"$NEW_ASPELL" = x"1"; then
+		AC_CHECK_LIB(aspell, new_aspell_config, [ ], [
+			dnl defeat cache
+			unset ac_cv_lib_aspell_new_aspell_config
+			AC_CHECK_LIB(aspell, new_aspell_config, [
+				PHP_ADD_LIBRARY(stdc++)
+			],[
+			dnl defeat cache
+			unset ac_cv_lib_aspell_new_aspell_config
+				AC_CHECK_LIB(aspell, new_aspell_config,
+				[
+					AC_MSG_RESULT([yes, and -lm])
+					PHP_ADD_LIBRARY(stdc++)
+					PHP_ADD_LIBRARY(m)
+				],[
+					AC_MSG_ERROR([do not know how to link new aspell library])
+				],[-lstdc++ -lm])
+			],[-lstdc++])
+		])
+		AC_DEFINE(HAVE_NEW_ASPELL, 1, [ ])
+		PSPELL_LIBNAME=aspell
+	else
+		PSPELL_LIBNAME=pspell
+	fi
 	AC_DEFINE(HAVE_PSPELL,1,[ ])
 	PHP_SUBST(PSPELL_SHARED_LIBADD)
-	PHP_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD)
+	PHP_ADD_LIBRARY_WITH_PATH($PSPELL_LIBNAME, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD)
 	PHP_ADD_INCLUDE($PSPELL_INCDIR)
 fi