From ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 10 Jan 2006 21:57:28 +0000 Subject: * 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 --- configure.ac | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 60a12d87..401244b3 100644 --- a/configure.ac +++ b/configure.ac @@ -243,19 +243,13 @@ AC_SUBST(POPPLER_QT4_LIBS) 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) -- cgit v1.2.3