diff options
| author | Albert Astals Cid <aacid@kde.org> | 2006-01-10 21:57:28 +0000 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2006-01-10 21:57:28 +0000 |
| commit | ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d (patch) | |
| tree | 2a360d1a40c97027694e70465bb202369f46ede4 /m4 | |
| parent | d9bc53a741b3bbd2a202662c66fe70f49ac72a49 (diff) | |
* 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
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/qt.m4 | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -156,6 +156,11 @@ have_qt4testlib=no 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" |