Mercurial > octave-dspies

comparison configure.ac @ 15298:704ab1b4c369

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Properly choose qmake if Qt3 and Qt4 are installed (Bug #37101) configure.ac: Look for qmake-qt5, qmake-qt4 ahead of qmake. Verify output of qmake.
author Rik <rik@octave.org>
date Tue, 04 Sep 2012 21:56:12 -0700
parents 2f0b74cf8b4d
children a8cfbc1911e4
comparison
equal deleted inserted replaced
15297:2f0b74cf8b4d 15298:704ab1b4c369
2194 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork], 2194 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork],
2195 [], 2195 [],
2196 [AC_MSG_ERROR([Qt libraries are required to build the GUI])]) 2196 [AC_MSG_ERROR([Qt libraries are required to build the GUI])])
2197 2197
2198 ## Check for Qt utility programs 2198 ## Check for Qt utility programs
2199 AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4 qmake-qt5]) 2199 AC_CHECK_PROGS(QMAKE, [qmake-qt5 qmake-qt4 qmake])
2200 if test -z "$QMAKE"; then 2200 if test -z "$QMAKE"; then
2201 AC_MSG_ERROR([qmake is required to build the GUI]) 2201 AC_MSG_ERROR([qmake is required to build the GUI])
2202 fi 2202 fi
2203 2203
2204 QT_INCDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_HEADERS://p' | sed -e 's,\\\\,/,g'` 2204 QT_INCDIR=`$QMAKE -query QT_INSTALL_HEADERS | sed -e 's,\\\\,/,g'`
2205 QT_LIBDIR=`$QMAKE -query | sed -n -e 's/^QT_INSTALL_LIBS://p' | sed -e 's,\\\\,/,g'` 2205 QT_LIBDIR=`$QMAKE -query QT_INSTALL_LIBS | sed -e 's,\\\\,/,g'`
2206
2207 if test "$QT_INCDIR" = "**Unknown**"; then
2208 AC_MSG_ERROR([qmake >= Qt4 is required to build the GUI])
2209 fi
2206 2210
2207 AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5]) 2211 AC_CHECK_PROGS(MOC, [moc moc-qt4 moc-qt5])
2208 AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5]) 2212 AC_CHECK_PROGS(UIC, [uic uic-qt4 uic-qt5])
2209 AC_CHECK_PROGS(RCC, [rcc]) 2213 AC_CHECK_PROGS(RCC, [rcc])
2210 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then 2214 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then