[evolution-rss] more gtkhtml detection issues

[Lucian Langa <lucilanga src gnome org>]

commit b724eb0fc1bc9dbf7c9e406094a06a4e9f6fffaa
Author: Lucian Langa <lucilanga gnome org>
Date:   Sat Dec 25 14:55:55 2010 +0200

    more gtkhtml detection issues

 configure.ac |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2126fb7..f9efa34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,14 +79,13 @@ fi
 dnl locate gtkhtml package
 GTKHTML=
 PKG_CHECK_MODULES([GTKHTML], libgtkhtml-3.14, [GH=3.14], [GH=])
-if test "x$GH" != "x3.14"; then
-	AC_MSG_ERROR([libgtkhtml-3.14 devel headers required])
-else
 if test "x$GH" == "x"; then
-	PKG_CHECK_MODULES(GTKHTML, libgtkhtml, [GH=], [])
-else
-GTKHTML="-$GH"
+	PKG_CHECK_MODULES(GTKHTML, libgtkhtml, [GH=], [GH=0])
 fi
+GTKHTML="-$GH"
+
+if test "x$GH" == "x0"; then
+	AC_MSG_ERROR([libgtkhtml-3.14 devel headers required])
 fi
 
 dnl base packages and versions
@@ -108,17 +107,17 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
 
 PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no])
 if test "x$GTKHTMLEDITOR" == "xyes"; then
-        AC_DEFINE_UNQUOTED(HAVE_GTKHTMLEDITOR, 1, [gthtml editor component present])
-        AC_SUBST(HAVE_GTKHTMLEDITOR)
-        AC_SUBST(GTKHTML_EDITOR_CFLAGS)
-        AC_SUBST(GTKHTML_EDITOR_LIBS)
+	AC_DEFINE_UNQUOTED(HAVE_GTKHTMLEDITOR, 1, [gthtml editor component present])
+	AC_SUBST(HAVE_GTKHTMLEDITOR)
+	AC_SUBST(GTKHTML_EDITOR_CFLAGS)
+	AC_SUBST(GTKHTML_EDITOR_LIBS)
 else
 PKG_CHECK_MODULES([GTKHTML_EDITOR], gtkhtml-editor$GTKHTML, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no])
 if test "x$GTKHTMLEDITOR" == "xyes"; then
-        AC_DEFINE_UNQUOTED(HAVE_GTKHTMLEDITOR, 1, [gthtml editor component present])
-        AC_SUBST(HAVE_GTKHTMLEDITOR)
-        AC_SUBST(GTKHTML_EDITOR_CFLAGS)
-        AC_SUBST(GTKHTML_EDITOR_LIBS)
+	AC_DEFINE_UNQUOTED(HAVE_GTKHTMLEDITOR, 1, [gthtml editor component present])
+	AC_SUBST(HAVE_GTKHTMLEDITOR)
+	AC_SUBST(GTKHTML_EDITOR_CFLAGS)
+	AC_SUBST(GTKHTML_EDITOR_LIBS)
 fi
 fi