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

---
 configure.in            | 24 +++++++++++++-----------
 src/proxyface/proxy.hxx |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index 5747917..1e1e5b3 100644
--- a/configure.in
+++ b/configure.in
@@ -179,26 +179,28 @@ else
   CPPFLAGS+=" -I$QTINCDIR"
   AC_ARG_WITH([moc],
              AC_HELP_STRING([--with-moc=/path/to/moc],
-                            [to specify the path to qt4 moc.]),
+                            [to specify the path to qt moc.]),
              [MOC="$withval"],
              [MOC=""])
-  AC_CHECK_PROGS([MOC], [$MOC moc-qt4 moc-mac moc])
-  test -n "$MOC" || AC_MSG_ERROR([moc for Qt 4 not found!])
+  AC_CHECK_PROGS([MOC], [$MOC moc moc-qt4 moc-mac])
+  test -n "$MOC" || AC_MSG_ERROR([moc for Qt not found!])
   AC_SUBST(MOC)
-  AC_CHECK_PROGS([RCC], [rcc-qt4 rcc-mac rcc])
-  test -n "$RCC" || AC_MSG_ERROR([rcc for Qt 4 not found!])
+  AC_CHECK_PROGS([RCC], [$(dirname $MOC)/rcc rcc rcc-qt4 rcc-mac])
+  test -n "$RCC" || AC_MSG_ERROR([rcc for Qt not found!])
   AC_SUBST(RCC)
-  AC_CHECK_PROGS([UIC], [uic-qt4 uic-mac uic])
-  test -n "$UIC" || AC_MSG_ERROR([uic for Qt 4 not found!])
+  AC_CHECK_PROGS([UIC], [$(dirname $MOC)/uic uic uic-qt4 uic-mac])
+  test -n "$UIC" || AC_MSG_ERROR([uic for Qt not found!])
   AC_SUBST(UIC)
-  AC_CHECK_PROGS([LRELEASE], [lrelease-qt4 lrelease-mac lrelease])
-  test -n "$LRELEASE" || AC_MSG_ERROR([lrelease for Qt 4 not found!])
+  AC_CHECK_PROGS([LRELEASE], [$(dirname $MOC)/lrelease lrelease lrelease-qt4 lrelease-mac])
+  test -n "$LRELEASE" || AC_MSG_ERROR([lrelease for Qt not found!])
   AC_SUBST(LRELEASE)
-  AC_CHECK_PROGS([LUPDATE], [lupdate-qt4 lupdate-mac lupdate])
-  test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt 4 not found!])
+  AC_CHECK_PROGS([LUPDATE], [$(dirname $MOC)/lupdate lupdate lupdate-qt4 lupdate-mac])
+  test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt not found!])
   AC_SUBST(LUPDATE)
   AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete])
 fi
+DISTCHECK_CONFIGURE_FLAGS="$(env)"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 # create output
 AC_OUTPUT
diff --git a/src/proxyface/proxy.hxx b/src/proxyface/proxy.hxx
index 9bbcb12..38afb77 100644
--- a/src/proxyface/proxy.hxx
+++ b/src/proxyface/proxy.hxx
@@ -141,7 +141,7 @@ namespace gui {
 
     public Q_SLOTS:
 
-      void proxyAuthenticationRequired(const QNetworkProxy& p,
+      void proxyAuthenticationRequired(const QNetworkProxy&,
                                        QAuthenticator* auth) {
         qDebug()<<"proxyAuthenticationRequired";
         _proxyAuth._realm->setText(auth->realm());
@@ -154,7 +154,7 @@ namespace gui {
         _auto.restart();
       }
       
-      void authenticationRequired(QNetworkReply*, QAuthenticator* auth) {
+      void authenticationRequired(QNetworkReply*, QAuthenticator*) {
       }
       
       void proxyFoundSlot(const QUrl&, const QNetworkProxy& p) {