[poppler] 3 commits - configure.ac qt4/demos qt4/src qt4/tests

[Albert Astals Cid]

 configure.ac          |    5 +++--
 qt4/demos/Makefile.am |    2 +-
 qt4/src/Makefile.am   |    2 +-
 qt4/tests/Makefile.am |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit cccfe42ed9c53d27cf6a1403ae55bf34a053012d
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Mar 22 19:12:05 2008 +0100

    Fix rm line not to error when no *moc file is present

diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 7353072..95e26a6 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -68,4 +68,4 @@ libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0
 poppler-optcontent.lo: poppler-optcontent.moc
 
 clean-generic:
-	rm *.moc
+	rm -f *.moc
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index 5072fcf..3d25a8b 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -56,7 +56,7 @@ stress_poppler_dir_SOURCES =			\
 stress_poppler_dir_LDADD = $(LDADDS)
 
 clean-generic:
-	rm *.moc
+	rm -f *.moc
 
 if BUILD_POPPLER_QT4
 TESTS = \
commit e60d39ba0e8b9742106a0c9b1385b1c907729c3f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Mar 22 19:11:17 2008 +0100

    Fix rm line not to error if no *moc file is present

diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
index 805f8a1..a1b1ba4 100644
--- a/qt4/demos/Makefile.am
+++ b/qt4/demos/Makefile.am
@@ -62,4 +62,4 @@ viewer.$(OBJEXT): viewer.moc
 poppler_qt4viewer_LDADD = $(LDADDS)
 
 clean-generic:
-	rm *.moc
\ No newline at end of file
+	rm -f *.moc
commit d9d52e622c6b28a9941168bb73839ec335ca7232
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Mar 22 19:10:40 2008 +0100

    Fix configure to not require gdk when we are on try mode

diff --git a/configure.ac b/configure.ac
index 4105cc5..d0f2a1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,8 +228,9 @@ if test x$enable_poppler_glib = xyes; then
     PKG_CHECK_MODULES(GDK, gdk-2.0)
   elif test x$enable_gdk = xtry; then
     if test x$enable_splash_output = xyes; then
-      PKG_CHECK_MODULES(GDK, gdk-2.0)
-      enable_gdk=yes
+      PKG_CHECK_MODULES(GDK, gdk-2.0,
+                        [enable_gdk="yes"],
+                        [enable_gdk="no"])
     elif test x$enable_cairo_output = xyes; then
       PKG_CHECK_MODULES(GDK, gdk-2.0,
                         [enable_gdk="yes"],