From 611fe01597a39e652c6eb4ddb4e04f76862a53ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 28 Apr 2014 11:47:02 +0000
Subject: [PATCH] first check Qt5 and allow to pass UIC/MOC explicitely; refs
 #30

---
 configure.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.in b/configure.in
index c305abb..b7bca40 100644
--- a/configure.in
+++ b/configure.in
@@ -94,27 +94,27 @@ AC_CHECK_PROG(have_dot, dot, yes, no)
 PKG_PROG_PKG_CONFIG
 
 # libraries
-PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
+PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets],
    [AC_DEFINE([HAVE_QTGUI])
-    UIC=$(pkg-config --variable=uic_location QtCore)
-    MOC=$(pkg-config --variable=moc_location QtCore)
+    UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)}
+    MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)}
     have_qtgui=1],
-   [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])],
+   [PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui])],
    [AC_DEFINE([HAVE_QTGUI])
-    UIC=$(pkg-config --variable=uic_location Qt5Core)
-    MOC=$(pkg-config --variable=moc_location Qt5Core)
+    UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)}
+    MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)}
     have_qtgui=1],
    [have_qtgui=0])
 AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1")
-PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
+PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network],
    [AC_DEFINE([HAVE_QTNETWORK])
-    UIC=$(pkg-config --variable=uic_location QtCore)
-    MOC=$(pkg-config --variable=moc_location QtCore)
+    UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)}
+    MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)}
     have_qtnetwork=1],
-   [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])],
+   [PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork])],
    [AC_DEFINE([HAVE_QTNETWORK])
-    UIC=$(pkg-config --variable=uic_location Qt5Core)
-    MOC=$(pkg-config --variable=moc_location Qt5Core)
+    UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)}
+    MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)}
     have_qtnetwork=1],
    [have_qtnetwork=0])
 AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1")