[poppler] configure.ac qt4/tests

[Albert Astals Cid]

 configure.ac          |   13 +++++++++++--
 qt4/tests/Makefile.am |   22 +++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

New commits:
commit 58e828d732f06bae9133dd518d89fa4348f1cca8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Sep 5 18:45:23 2008 +0200

    Only like QtTest to the tests, not to the lib itself

diff --git a/configure.ac b/configure.ac
index aa3b932..e098f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,16 +317,25 @@ AC_ARG_ENABLE(poppler-qt4,
               enable_poppler_qt4="try")
 if test x$enable_poppler_qt4 = xyes; then
   PKG_CHECK_MODULES(POPPLER_QT4, 
-	            QtCore >= 4.1.0 QtGui >= 4.1.0 QtXml >= 4.1.0 QtTest >= 4.1.0)
+	            QtCore >= 4.1.0 QtGui >= 4.1.0 QtXml >= 4.1.0)
+  PKG_CHECK_MODULES(POPPLER_QT4_TEST, 
+	            QtTest >= 4.1.0)
 elif test x$enable_poppler_qt4 = xtry; then
   PKG_CHECK_MODULES(POPPLER_QT4,
-		    QtCore >= 4.1.0 QtGui >= 4.1.0 QtXml >= 4.1.0 QtTest >= 4.1.0,
+                    QtCore >= 4.1.0 QtGui >= 4.1.0 QtXml >= 4.1.0,
                     [enable_poppler_qt4="yes"],
                     [enable_poppler_qt4="no"])
+  if test x$enable_poppler_qt4 = xyes; then
+    PKG_CHECK_MODULES(POPPLER_QT4_TEST,
+                    QtTest >= 4.1.0,
+                    [enable_poppler_qt4="yes"],
+                    [enable_poppler_qt4="no"])
+  fi
 fi
 
 AC_SUBST(POPPLER_QT4_CXXFLAGS)
 AC_SUBST(POPPLER_QT4_LIBS)
+AC_SUBST(POPPLER_QT4_TEST_LIBS)
 
 if test x$enable_poppler_qt4 = xyes; then
   AC_MSG_CHECKING([for Qt4 moc])
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index 8afbf6c..99c35ef 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -76,47 +76,47 @@ check_PROGRAMS = $(TESTS)
 
 check_attachments_SOURCES = check_attachments.cpp
 check_attachments.$(OBJEXT): check_attachments.moc
-check_attachments_LDADD = $(LDADDS)
+check_attachments_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_actualtext_SOURCES = check_actualtext.cpp
 check_actualtext.$(OBJEXT): check_actualtext.moc
-check_actualtext_LDADD = $(LDADDS)
+check_actualtext_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_dateConversion_SOURCES = check_dateConversion.cpp
 check_dateConversion.$(OBJEXT): check_dateConversion.moc
-check_dateConversion_LDADD = $(LDADDS)
+check_dateConversion_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_fonts_SOURCES = check_fonts.cpp
 check_fonts.$(OBJEXT): check_fonts.moc
-check_fonts_LDADD = $(LDADDS)
+check_fonts_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_metadata_SOURCES = check_metadata.cpp
 check_metadata.$(OBJEXT): check_metadata.moc
-check_metadata_LDADD = $(LDADDS)
+check_metadata_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_optcontent_SOURCES = check_optcontent.cpp
 check_optcontent.$(OBJEXT): check_optcontent.moc
-check_optcontent_LDADD = $(LDADDS)
+check_optcontent_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_pagemode_SOURCES = check_pagemode.cpp
 check_pagemode.$(OBJEXT): check_pagemode.moc
-check_pagemode_LDADD = $(LDADDS)
+check_pagemode_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_permissions_SOURCES = check_permissions.cpp
 check_permissions.$(OBJEXT): check_permissions.moc
-check_permissions_LDADD = $(LDADDS)
+check_permissions_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_pagelayout_SOURCES = check_pagelayout.cpp
 check_pagelayout.$(OBJEXT): check_pagelayout.moc
-check_pagelayout_LDADD = $(LDADDS)
+check_pagelayout_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_password_SOURCES = check_password.cpp
 check_password.$(OBJEXT): check_password.moc
-check_password_LDADD = $(LDADDS)
+check_password_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 check_search_SOURCES = check_search.cpp
 check_search.$(OBJEXT): check_search.moc
-check_search_LDADD = $(LDADDS)
+check_search_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
 endif