[evolution-rss/evolution-rss-0-2-0] add last moment fix for gtkhtml detection

[Lucian Langa <lucilanga src gnome org>]

commit 54e57906b0ede0d1f4066c5e34cb7c406b473798
Author: Lucian Langa <lucilanga gnome org>
Date:   Sun Dec 19 17:48:56 2010 +0200

    add last moment fix for gtkhtml detection

 configure.ac    |   10 +++++++++-
 src/Makefile.am |    1 +
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7f062c4..7892383 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,12 +111,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])
diff --git a/src/Makefile.am b/src/Makefile.am
index e07ce0f..019942a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -112,6 +112,7 @@ server_in_files = GNOME_Evolution_RSS.server.in.in
 
 if HAVE_BONOBO
 server_DATA = $(server_in_files:.server.in.in=_$(EVOLUTION_EXEC_VERSION).server)
+	touch $(top_srcdir)/po/POTFILES.skip
 	sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.skip
 	sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
 	echo 'src/GNOME_Evolution_RSS.server.in.in' >> $(top_srcdir)/po/POTFILES.in