[poppler] poppler: ChangeLog,1.284,1.285 configure.ac,1.46,1.47

[Albert Astals Cid]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv12650

Modified Files:
	ChangeLog configure.ac 
Log Message:
        * configure.ac:
        * m4/qt.m4: Fix bugs created when splitting the code from
        configure.ac, take QTDIR into account when looking for QtTestLib and
        do not die if it is not found as it is not mandatory
        * qt/poppler-page-transition.cc:
        * qt/poppler-page.cc:
        * qt/poppler-private.h:
        * qt4/tests/Makefile.am:
        * qt4/src/poppler-qt4.h:
        * qt4/src/poppler-page.cc:
        * qt4/src/Makefile.am: Fix mess created my the moving and renaming of
        PageTransition.cc


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- ChangeLog	10 Jan 2006 17:59:51 -0000	1.284
+++ ChangeLog	10 Jan 2006 21:57:28 -0000	1.285
@@ -1,3 +1,18 @@
+2006-01-10  Albert Astals Cid  <aacid at kde.org>
+
+	* configure.ac:
+	* m4/qt.m4: Fix bugs created when splitting the code from
+	configure.ac, take QTDIR into account when looking for QtTestLib and
+	do not die if it is not found as it is not mandatory
+	* qt/poppler-page-transition.cc:
+	* qt/poppler-page.cc:
+	* qt/poppler-private.h:
+	* qt4/tests/Makefile.am:
+	* qt4/src/poppler-qt4.h:
+	* qt4/src/poppler-page.cc:
+	* qt4/src/Makefile.am: Fix mess created my the moving and renaming of
+	PageTransition.cc
+
 2006-01-10  Kristian Høgsberg  <krh at redhat.com>
 
 	* splash/Makefile.am: Only install splash headers if

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- configure.ac	6 Jan 2006 10:05:58 -0000	1.46
+++ configure.ac	10 Jan 2006 21:57:28 -0000	1.47
@@ -243,19 +243,13 @@
 AM_CONDITIONAL(BUILD_POPPLER_QT4, test x$enable_poppler_qt4 = xyes)
 
 if test x$enable_poppler_qt4 = xyes; then
-  POPPLER_FIND_QT4TEST(POPPLER_QTTEST)
+  POPPLER_FIND_QT4TEST(POPPLER_QTTEST,
+                      [enable_poppler_qt4testlib="yes"],
+                      [enable_poppler_qt4testlib="no"])
   AC_SUBST(POPPLER_QTTEST_CXXFLAGS)
   AC_SUBST(POPPLER_QTTEST_LIBS)
-fi
-
-if test x$have_qt4testlib = xno ; then
-    AC_MSG_WARN([QtTestLib libraries not found])
-fi
-
-if test x$have_qt4testlib = xyes; then
-    enable_poppler_qt4testlib="yes"
 else
-    enable_poppler_qt4testlib="no"
+  enable_poppler_qt4testlib="no"
 fi
 
 AM_CONDITIONAL(BUILD_POPPLER_QT4TESTS, test x$enable_poppler_qt4testlib = xyes)