soc.2008.finch: 11be12e0: Added autoconfigure detection of Enchant...

[queueram at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 11be12e0756a03820c8a2531b2e643eda2690a64
Ancestor: da4faa173bbbcd17d723617fb0925eba18812f0c
Author: queueram at soc.pidgin.im
Date: 2008-06-03T05:52:13
Branch: im.pidgin.soc.2008.finch
URL: http://d.pidgin.im/viewmtn/revision/info/11be12e0756a03820c8a2531b2e643eda2690a64

Modified files:
        configure.ac finch/libgnt/configure.ac

ChangeLog: 

Added autoconfigure detection of Enchant to root configure.ac.
Fixed up some wording mistakes in libgnt configure.ac.

-------------- next part --------------
============================================================
--- configure.ac	52f3c1c25225b8f21bae8143f790022ef26b0326
+++ configure.ac	90b17a5e3d42aae75c1ca47ae9206c6c0c5b66dd
@@ -664,6 +664,34 @@ if test "x$enable_consoleui" = "xyes"; t
 			fi
 		fi
 	fi
+
+	dnl Check for Enchant for spell checking
+	dnl (Thanks to gedit)
+	AC_ARG_ENABLE([gntspell],
+				  AS_HELP_STRING([--disable-gntspell],[Disable libgnt spell checking (default: enabled)]),
+				  [enable_enchant=$enableval],
+				  [enable_enchant=yes])
+
+	if test "x$enable_enchant" = "xyes" ; then
+
+		PKG_CHECK_MODULES(ENCHANT, [enchant >= 1.3.0], \
+						  have_enchant=yes, have_enchant=no)
+
+		if test "x$have_enchant" = "xyes"; then
+
+			ENCHANT_CFLAGS="${ENCHANT_CFLAGS}"
+			ENCHANT_LIBS="${ENCHANT_LIBS}"
+			AC_DEFINE(USE_ENCHANT, 1, [Define if enchant spell checking is enabled.])
+		else
+			AC_MSG_ERROR([Enchant library not found or too old. Use --disable-gntspell to build without libgnt spell checking.])
+		fi
+	else
+		ENCHANT_CFLAGS=
+		ENCHANT_LIBS=
+	fi
+
+	AC_SUBST(ENCHANT_CFLAGS)
+	AC_SUBST(ENCHANT_LIBS)
 fi
 
 if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
============================================================
--- finch/libgnt/configure.ac	7df76f1182cb8bfe033e26322744b071ff1bdd4f
+++ finch/libgnt/configure.ac	2acf16421526abb399798b2fe86c3a3e4cfe82fb
@@ -345,8 +345,8 @@ dnl (Thanks to gedit)
 
 dnl Check for Enchant for spell checking
 dnl (Thanks to gedit)
-AC_ARG_ENABLE([spell],
-  AS_HELP_STRING([--disable-spell],[Disable spell plugin (default: enabled)]),
+AC_ARG_ENABLE([gntspell],
+  AS_HELP_STRING([--disable-gntspell],[Disable spell checking (default: enabled)]),
   [enable_enchant=$enableval],
   [enable_enchant=yes])
  
@@ -361,13 +361,12 @@ if test "x$enable_enchant" = "xyes" ; th
     ENCHANT_LIBS="${ENCHANT_LIBS}"
 	AC_DEFINE(USE_ENCHANT, 1, [Define if enchant spell checking is enabled.])
   else
-    AC_MSG_ERROR([Enchant library not found or too old. Use --disable-spell to build without spell plugin.])
+    AC_MSG_ERROR([Enchant library not found or too old. Use --disable-gntspell to build without spell checking.])
   fi
 else
   ENCHANT_CFLAGS=
   ENCHANT_LIBS=
 fi
- 
 AC_SUBST(ENCHANT_CFLAGS)
 AC_SUBST(ENCHANT_LIBS)