From ab0cbcd43ba972c7ca1db81274ac62e84bea4c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 16 May 2014 09:10:10 +0000 Subject: [PATCH] check and try to detect Qt tools; refs #40 --- configure.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 4f3eef4..89c136d 100644 --- a/configure.in +++ b/configure.in @@ -128,9 +128,21 @@ PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets Qt5Network], have_qt=1], [have_qt=0])]) AM_CONDITIONAL(HAVE_QT, test "$have_qt" = "1") -if test "$have_qt" = "1"; then - test -n "$UIC" -a -n "$MOC" -a -n "$RCC" -a -n "$LUPDATE" -a -n "$LRELEASE" - which "$UIC" "$MOC" "$RCC" "$LUPDATE" "$LRELEASE" +if test "$have_qt" = "1" \ + && ! which "$UIC" "$MOC" "$RCC" "$LUPDATE" "$LRELEASE"; then + if test -n "$MOC" \ + && which "${UIC:=${MOC/moc/uic}}" "${RCC:=${MOC/moc/rcc}}" \ + "${LUPDATE:=${MOC/moc/lupdate}}" \ + "${LRELEASE:=${MOC/moc/lrelease}}"; then + AC_MSG_NOTICE([Detected: "$UIC" "$MOC" "$RCC" "$LUPDATE" "$LRELEASE"]) + else + AC_MSG_ERROR([Missing QT Programs. + - Needed: moc rcc lupdate lrelease + - Found: $UIC $MOC $RCC $LUPDATE $LRELEASE +You can specify the missing programs by passing one of the variables: + \$UIC \$MOC \$RCC \$LUPDATE \$LRELEASE +Often it is sufficient to specify MOC=/path/to/moc ./configure)]) + fi fi AC_SUBST(UIC) AC_SUBST(MOC)