From 83578df2cee08a77b91ddc95bf626c8461e07d37 Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Wed, 31 Aug 2011 15:07:10 +0000 Subject: [PATCH] Tell the user that QtWebKit or QtXml have not been found (even though parts of Qt4 might be present) --- configure.ac | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 6268d37e..8173f072 100644 --- a/configure.ac +++ b/configure.ac @@ -14,11 +14,6 @@ dnl ----------------------------------------------- #The above macro does not work if pkg-config is not installed, therefore, for the moment we stay with the solution below: m4_ifdef([PKG_CHECK_MODULES],[],AC_MSG_ERROR([Please install pkg-config before configuring musrfit!])) -dnl ----------------------------------------------- -dnl Save the configure command -dnl ----------------------------------------------- -CONFIGCOMMAND="$0 $@" - dnl ----------------------------------------------- dnl Package names and version numbers dnl ----------------------------------------------- @@ -828,7 +823,8 @@ if test "x$enable_editor" != "xno"; then fi], [if test "x${QMAKEBIN}" = "x"; then PKG_CHECK_MODULES(QT4, QtWebKit >= $QT4MINVER QtXml >= $QT4MINVER, [QT4_FOUND=yes], - [PKG_CHECK_MODULES(QT3, qt >= 3.3.0 qt < 4.0, [QT3_FOUND=yes], + [AC_MSG_NOTICE([Qt4 (including QtWebKit and QtXml) not found!]) + PKG_CHECK_MODULES(QT3, qt >= 3.3.0 qt < 4.0, [QT3_FOUND=yes], [PKG_CHECK_MODULES(QT3MT, qt-mt >= 3.3.0 qt-mt < 4.0, [QT3MT_FOUND=yes], [QT3MT_FOUND=no])] )] ) @@ -1074,13 +1070,6 @@ echo "+ echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" echo "" -echo " Invocation command line:" -echo " ------------------------" -echo "" -echo " $ ${CONFIGCOMMAND}" -echo "" -echo "" - echo " System:" echo " -------" echo ""