From 408cafc889e02170c36b827938fa8a1eeee029e0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 14 May 2013 14:49:22 -0500 Subject: [PATCH] build: fix detection of Qt on non-Fedora platforms (bgo #691583) Apparently Qt.pc is a Fedora-specific file to allow parallel install of Qt3 and Qt4. We should instead be using the upstream QtCore. https://bugzilla.gnome.org/show_bug.cgi?id=691583 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 669e692e64..61fe58e2d7 100644 --- a/configure.ac +++ b/configure.ac @@ -229,7 +229,7 @@ AC_SUBST(GUDEV_LIBS) GOBJECT_INTROSPECTION_CHECK([0.9.6]) # Qt4 -PKG_CHECK_MODULES(QT, [Qt >= 4 QtCore QtDBus QtNetwork], [have_qt=yes],[have_qt=no]) +PKG_CHECK_MODULES(QT, [QtCore >= 4 QtDBus QtNetwork], [have_qt=yes],[have_qt=no]) AC_ARG_ENABLE(qt, AS_HELP_STRING([--enable-qt], [enable Qt examples]), [enable_qt=${enableval}], [enable_qt=${have_qt}]) if (test "${enable_qt}" = "yes"); then @@ -239,7 +239,7 @@ if (test "${enable_qt}" = "yes"); then AC_SUBST(QT_CFLAGS) AC_SUBST(QT_LIBS) # Check for moc-qt4 and if not found then moc - QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` + QT4_BINDIR=`$PKG_CONFIG QtCore --variable moc_location` AC_CHECK_PROGS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH]) fi AM_CONDITIONAL(WITH_QT, test "${enable_qt}" = "yes")