From b2c20386d71fe541cccc75718e7c99c1fc31d5f5 Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 5 Apr 2011 14:51:41 +0000 Subject: [PATCH] configure fails if suitable qmake not found --- configure.ac | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 9ea860165..c6d7fc7b5 100644 --- a/configure.ac +++ b/configure.ac @@ -2423,15 +2423,19 @@ else AC_CHECK_PROGS(QMAKE,qmake qmake-qt4,false) - PKG_CHECK_MODULES(QT, [QtCore],[ - use_qt="Yes" - AC_DEFINE_UNQUOTED(HAVE_QT,1, - [Define if you have Qt]) - AC_SUBST(QT_CFLAGS) - AC_SUBST(QT_LIBS) - ],[ - use_qt="No (Qt not available)" - ]) + if test "$(QMAKE)" = "false"; then + use_qt="No (qmake not found)" + else + PKG_CHECK_MODULES(QT, [QtCore],[ + use_qt="Yes" + AC_DEFINE_UNQUOTED(HAVE_QT,1, + [Define if you have Qt]) + AC_SUBST(QT_CFLAGS) + AC_SUBST(QT_LIBS) + ],[ + use_qt="No (QtCore not available)" + ]) + fi fi AM_CONDITIONAL(WITH_QT, [test "x$use_qt" = "xYes"]) -- 2.40.0