[poppler] poppler: ChangeLog,1.182,1.183 configure.ac,1.30,1.31

[Martin Kretzschmar]

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
* configure.ac: add /usr/include/qt4 to qt4_incdirs. That's what
Debian and Ubuntu use. Maybe we should just use pkg-config. If
it's usable with qt4.

* test/.cvsignore: ignore pdf_inspector binary.


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- ChangeLog	24 Aug 2005 18:57:46 -0000	1.182
+++ ChangeLog	24 Aug 2005 19:41:27 -0000	1.183
@@ -1,3 +1,11 @@
+2005-08-24  Martin Kretzschmar  <martink at gnome.org>
+
+	* configure.ac: add /usr/include/qt4 to qt4_incdirs. That's what
+	Debian and Ubuntu use. Maybe we should just use pkg-config. If
+	it's usable with qt4.
+
+	* test/.cvsignore: ignore pdf_inspector binary.
+
 2005-08-24  Kristian Høgsberg  <krh at redhat.com>
 
 	* poppler/TextOutputDev.cc: Push rotation argument down to

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- configure.ac	23 Aug 2005 18:20:45 -0000	1.30
+++ configure.ac	24 Aug 2005 19:41:27 -0000	1.31
@@ -325,7 +325,7 @@
 dnl ===================================================================
 
 dnl Search paths for Qt4 - not much real experience with this yet.
-qt4_incdirs="/usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
+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