LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

Tell the user that QtWebKit or QtXml have not been found (even though parts of Qt4 might be present)

Browse Source
This commit is contained in:
Bastian M. Wojek
2011-08-31 15:07:10 +00:00
parent e5c673dda2
commit 83578df2ce
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -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: #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!])) 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 -----------------------------------------------
dnl Package names and version numbers dnl Package names and version numbers
dnl ----------------------------------------------- dnl -----------------------------------------------
@ -828,7 +823,8 @@ if test "x$enable_editor" != "xno"; then
fi], fi],
[if test "x${QMAKEBIN}" = "x"; then [if test "x${QMAKEBIN}" = "x"; then
PKG_CHECK_MODULES(QT4, QtWebKit >= $QT4MINVER QtXml >= $QT4MINVER, [QT4_FOUND=yes], 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])] [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 "" echo ""
echo " Invocation command line:"
echo " ------------------------"
echo ""
echo " $ ${CONFIGCOMMAND}"
echo ""
echo ""
echo " System:" echo " System:"
echo " -------" echo " -------"
echo "" echo ""