Mercurial > octave

comparison m4/acinclude.m4 @ 23414:a759896c2b53 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla library. * acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Add "qscintilla2_qt5" to list of possible Qt5 QScintilla library names.
author Rik <rik@octave.org>
date Wed, 19 Apr 2017 09:43:53 -0700
parents 3ac9f9ecfae5
children dd9d5522de04 6ae0292aaa5c
comparison
equal deleted inserted replaced
23394:7ca04e85f9e3 23414:a759896c2b53
1344 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" 1344 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL"
1345 octave_qscintilla_libnames=qscintilla2 1345 octave_qscintilla_libnames=qscintilla2
1346 ;; 1346 ;;
1347 5) 1347 5)
1348 QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" 1348 QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
1349 octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" 1349 octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2"
1350 ;; 1350 ;;
1351 *) 1351 *)
1352 AC_MSG_ERROR([Unrecognized Qt version $qt_version]) 1352 AC_MSG_ERROR([Unrecognized Qt version $qt_version])
1353 ;; 1353 ;;
1354 esac 1354 esac