Use PKG_CHECK_MODULES to detect the Enchant library

diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4
index 44fee08738e0ba33c4793bb3a476059c4a597f06..cd2765c7ef3ddb50912bb23db10c97530d658ab2 100644 (file)
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@@ -1,39 +1,21 @@
 PHP_ARG_WITH([enchant],
-  [for ENCHANT support],
-  [AS_HELP_STRING([[--with-enchant[=DIR]]],
-    [Include enchant support. GNU Aspell version 1.1.3 or higher required.])])
+  [whether to build with Enchant support],
+  [AS_HELP_STRING([--with-enchant],
+    [Include Enchant support])])
 
 if test "$PHP_ENCHANT" != "no"; then
-       PHP_NEW_EXTENSION(enchant, enchant.c, $ext_shared)
-       if test "$PHP_ENCHANT" != "yes"; then
-           ENCHANT_SEARCH_DIRS=$PHP_ENCHANT
-       else
-           ENCHANT_SEARCH_DIRS="/usr/local /usr"
-       fi
-       for i in $ENCHANT_SEARCH_DIRS; do
-               if test -f $i/include/enchant/enchant.h; then
-                       ENCHANT_DIR=$i
-                       ENCHANT_INCDIR=$i/include/enchant
-               elif test -f $i/include/enchant.h; then
-                       ENCHANT_DIR=$i
-                       ENCHANT_INCDIR=$i/include
-               fi
-       done
+  PHP_NEW_EXTENSION(enchant, enchant.c, $ext_shared)
 
-       if test -z "$ENCHANT_DIR"; then
-               AC_MSG_ERROR(Cannot find enchant)
-       fi
+  PKG_CHECK_MODULES([ENCHANT], [enchant])
 
-       ENCHANT_LIBDIR=$ENCHANT_DIR/lib
+  PHP_EVAL_INCLINE($ENCHANT_CFLAGS)
+  PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
 
-       AC_DEFINE(HAVE_ENCHANT,1,[ ])
-       PHP_SUBST(ENCHANT_SHARED_LIBADD)
-       PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
-       PHP_ADD_INCLUDE($ENCHANT_INCDIR)
-       PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
-       [
-         AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM,             1, [ ])
-         AC_DEFINE(ENCHANT_VERSION_STRING,             "1.5.x", [ ])
-       ], [], [ -L$ENCHANT_LIBDIR $ENCHANT_SHARED_LIBADD])
+  AC_DEFINE(HAVE_ENCHANT, 1, [ ])
 
+  PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
+  [
+    AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+    AC_DEFINE(ENCHANT_VERSION_STRING, "1.5.x", [ ])
+  ])
 fi