[poppler] poppler/poppler: Makefile.am,1.26,1.27

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv6726/poppler

Modified Files:
	Makefile.am 
Log Message:
        * configure.ac
        * poppler/Makefile.am
        * qt4/src/Makefile.am
        * qt4/src/poppler-document.cc
        * qt4/src/poppler-link.cc
        * qt4/src/poppler-page.cc
        * qt4/src/poppler-private.h
        * qt4/src/poppler-qt4.h: Make the Qt4 backend compilable even with
        no Splash backend. Patch by Pino Toscano <pino at kde.org>.


Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	8 Oct 2006 20:38:47 -0000	1.26
+++ Makefile.am	13 Jan 2007 18:29:39 -0000	1.27
@@ -13,8 +13,6 @@
 	$(SPLASH_LIBS)				\
 	$(top_builddir)/splash/libsplash.la
 
-endif
-
 if BUILD_POPPLER_QT4
 
 poppler_arthur = libpoppler-arthur.la
@@ -31,6 +29,9 @@
 
 endif
 
+endif
+
+
 
 if BUILD_CAIRO_OUTPUT