[evolution-rss] fix gtkhtml-editor detection
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-rss] fix gtkhtml-editor detection
- Date: Sun, 19 Dec 2010 19:59:35 +0000 (UTC)
commit 16b0754fa3f6e768d23f502a7db18de3c0792677
Author: Lucian Langa <lucilanga gnome org>
Date: Sun Dec 19 21:55:30 2010 +0200
fix gtkhtml-editor detection
configure.ac | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0850c86..2126fb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,12 +106,20 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
libgtkhtml$GTKHTML >= $LIBGTKHTML_REQUIRED
])
-PKG_CHECK_MODULES([GTKHTML_EDITOR], libgtkhtml$GTKHTML, [GTKHTMLEDITOR=yes], [GTKHTMLEDITOR=no])
+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)
+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)
+fi
fi
PKG_CHECK_MODULES([EVOLUTION_DATASERVER], evolution-data-server-1.2, [have_ds=yes], [have_ds=no])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]