[evince] Revert "Do not link libxml with pdf backend"

[Jan-Joost Spanjers <jspanjers src gnome org>]

commit 7e6913e38e012b97cde698736d2eec6291d834c7
Author: Hib Eris <hib hiberis nl>
Date:   Thu Dec 15 17:05:02 2011 +0100

    Revert "Do not link libxml with pdf backend"
    
    This reverts commit 8bce7d5d6e63c82a1b58aeeab25adf6c91807772.
    
    That commit clearly was an error of mine.

 configure.ac                           |    5 ++---
 cut-n-paste/toolbar-editor/Makefile.am |    5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 66a32a1..69454e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,8 +189,7 @@ case "$with_platform" in
         ;;
 esac
 
-PKG_CHECK_MODULES([SHELL_CORE],[gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
-PKG_CHECK_MODULES([LIBXML],[libxml-2.0 >= $LIBXML_REQUIRED])
+PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
 
 # *********
 # SM client
@@ -472,7 +471,7 @@ AC_ARG_ENABLE([pdf],
 
 if test "x$enable_pdf" = "xyes"; then
     POPPLER_REQUIRED=0.18.0
-    PKG_CHECK_MODULES(POPPLER, [poppler-glib >= $POPPLER_REQUIRED], enable_pdf=yes, enable_pdf=no)
+    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index 52f57ff..b3e843e 100644
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -24,16 +24,11 @@ libtoolbareditor_la_CPPFLAGS = \
 
 libtoolbareditor_la_CFLAGS = \
 	$(SHELL_CORE_CFLAGS)			\
-	$(LIBXML_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
 	-DCURSOR_DIR=\"$(pkgdatadir)\"		\
 	$(AM_CFLAGS)
 
-libtoolbareditor_la_LIBADD = 	\
-	$(SHELL_CORE_LIBS)	\
-	$(LIBXML_LIBS)
-
 BUILT_SOURCES = \
 	eggmarshalers.c \
 	eggmarshalers.h \