diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | test/.cvsignore | 7 |
3 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2005-08-24 Martin Kretzschmar <martink@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@redhat.com> * poppler/TextOutputDev.cc: Push rotation argument down to diff --git a/configure.ac b/configure.ac index 6a3ef160..146571ac 100644 --- a/configure.ac +++ b/configure.ac @@ -325,7 +325,7 @@ dnl Adapted from Qt3 check above! 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 diff --git a/test/.cvsignore b/test/.cvsignore index f345db9a..c95ea0d1 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -1,10 +1,11 @@ +*.la +*.lo +*.loT .cvsignore .deps .libs Makefile Makefile.in -*.la -*.lo -*.loT gtk-cairo-test gtk-splash-test +pdf_inspector |