From 26dc507d68d5763c67837252346283b2de5abcad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 5 May 2014 12:35:42 +0000
Subject: [PATCH] find all tools in same dir as moc; refs #40

---
 configure.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index a3009d7..913ad05 100644
--- a/configure.in
+++ b/configure.in
@@ -128,13 +128,13 @@ AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(LIBS)
 # Qt Environment
-AC_MSG_CHECKING(QT4 directory)
+AC_MSG_CHECKING(QT directory)
 QTDIR="no"
 AC_ARG_WITH([qt-dir],
-             AC_HELP_STRING([--with-qt-dir=/path/to/Qt4],
-                            [to specify the path to the Qt4 directory.]),
+             AC_HELP_STRING([--with-qt-dir=/path/to/Qt],
+                            [to specify the path to the Qt directory.]),
              [QTPATHS="$withval"],
-             [QTPATHS="/usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include /usr/include /usr/local/include /opt/include /opt/local/include"])
+             [QTPATHS="/usr/include /usr/local/include /opt/include /opt/local/include /usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include"])
 for x in $QTPATHS; do
     if test -d $x/QtCore ; then
        QTINCDIR=$x
@@ -181,15 +181,15 @@ else
              AC_HELP_STRING([--with-moc=/path/to/moc],
                             [to specify the path to qt moc.]),
              [MOC="$withval"
-              RCC="$(dirname $withval")/rcc"
-              UIC="$(dirname $withval")/uic"
-              LRELEASE="$(dirname $withval")/lrelease"
-              LUPDATE="$(dirname $withval")/lupdate"],
-             [MOC=""
-              RCC=""
-              UIC=""
-              LRELEASE=""
-              LUPDATE=""])
+              RCC="$(dirname $withval)/rcc"
+              UIC="$(dirname $withval)/uic"
+              LRELEASE="$(dirname $withval)/lrelease"
+              LUPDATE="$(dirname $withval)/lupdate"],
+             [MOC="${QTDIR}/bin/moc"
+              RCC="${QTDIR}/bin/rcc"
+              UIC="${QTDIR}/bin/uic"
+              LRELEASE="${QTDIR}/bin/lrelease"
+              LUPDATE="${QTDIR}/bin/lupdate"])
   AC_CHECK_PROGS([MOC], ["$MOC" moc moc-qt4 moc-mac])
   test -n "$MOC" || AC_MSG_ERROR([moc for Qt not found!])
   AC_SUBST(MOC)