Mercurial > octave

diff 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
line wrap: on
line diff
--- a/m4/acinclude.m4	Thu Apr 13 10:28:43 2017 -0400
+++ b/m4/acinclude.m4	Wed Apr 19 09:43:53 2017 -0700
@@ -1346,7 +1346,7 @@
     ;;
     5)
       QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
-      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
+      octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2"
     ;;
     *)
       AC_MSG_ERROR([Unrecognized Qt version $qt_version])