[poppler] poppler/m4: qt.m4,1.1,1.2

[Albert Astals Cid]

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

Modified Files:
	qt.m4 
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: qt.m4
===================================================================
RCS file: /cvs/poppler/poppler/m4/qt.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qt.m4	6 Jan 2006 10:05:58 -0000	1.1
+++ qt.m4	10 Jan 2006 21:57:28 -0000	1.2
@@ -156,6 +156,11 @@
 qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
 qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
 
+if test -n "$QTDIR" ; then
+    qt4_incdirs="$QTDIR/include $qt4_incdirs"
+    qt4_libdirs="$QTDIR/lib $qt4_libdirs"
+fi
+
 dnl What to test
 qt4test_test_include="QtTest/QtTest"
 qt4test_test_la_library="libQtTest.la"