From bbea3ddf2219687d43fe4a623d68325999c1dd11 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 18 Feb 2009 12:03:35 +0000 Subject: [PATCH] bugfix: the QT lib now depends on QtSql, so add this to the configure --- configure.ac | 6 ++++++ lib/packagekit-qt/src/Makefile.am | 2 ++ 2 files changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac index 932403579..1ce261cbc 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,7 @@ POLKIT_GRANT_REQUIRED=0.8 QTCORE_REQUIRED=4.4.0 QTDBUS_REQUIRED=4.4.0 QTGUI_REQUIRED=4.4.0 +QTSQL_REQUIRED=4.4.0 dnl --------------------------------------------------------------------------- dnl - Make above strings available for packaging files (e.g. rpm spec files) @@ -168,6 +169,11 @@ if test x$enable_qt = xyes; then AC_SUBST(QTGUI_CFLAGS) AC_SUBST(QTGUI_LIBS) + + PKG_CHECK_MODULES(QTSQL, QtSql >= $QTSQL_REQUIRED) + AC_SUBST(QTSQL_CFLAGS) + AC_SUBST(QTSQL_LIBS) + PKG_CHECK_MODULES(CPPUNIT, cppunit) AC_SUBST(CPPUNIT_CFLAGS) AC_SUBST(CPPUNIT_LIBS) diff --git a/lib/packagekit-qt/src/Makefile.am b/lib/packagekit-qt/src/Makefile.am index fa7e8ff53..ff26355ec 100644 --- a/lib/packagekit-qt/src/Makefile.am +++ b/lib/packagekit-qt/src/Makefile.am @@ -5,6 +5,7 @@ NULL = INCLUDES = \ $(QTCORE_CFLAGS) \ $(QTDBUS_CFLAGS) \ + $(QTSQL_CFLAGS) \ $(POLKIT_CFLAGS) \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @@ -60,6 +61,7 @@ libpackagekit_qt_la_SOURCES = \ libpackagekit_qt_la_LIBADD = \ $(QTCORE_LIBS) \ $(QTDBUS_LIBS) \ + $(QTSQL_LIBS) \ $(POLKIT_LIBS) \ $(NULL)