Mercurial > hg > octave-lyh

comparison configure.ac @ 16662:72665c4ae25b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow build to continue without QScintilla lexer for Octave * configure.ac: Check for Qsci/qscilexeroctave.h and Qsci/qscilexermatlab.h. * file-editor-tab.cc: Include Qsci/qscilexeroctave.h if it is available, otherwise include Qsci/qscilexermatlab.h if it is available. (file_editor_tab::update_lexer): For Octave files, use QsciLexerOctave if it is available, otherwise use QsciLexerMatlab if it is available, otherwise use default lexer.
author John W. Eaton <jwe@octave.org>
date Wed, 15 May 2013 01:30:16 -0400
parents 608e307b4914
children c7d4146c570d
comparison
equal deleted inserted replaced
16661:8291109ac3fd 16662:72665c4ae25b
2646 ## other regular Qt libraries. 2646 ## other regular Qt libraries.
2647 QT_LIBS="$QT_LIBS -lqscintilla2" 2647 QT_LIBS="$QT_LIBS -lqscintilla2"
2648 OCTAVE_CHECK_FUNC_FINDFIRST_MODERN 2648 OCTAVE_CHECK_FUNC_FINDFIRST_MODERN
2649 AC_DEFINE(HAVE_QSCINTILLA, 1, 2649 AC_DEFINE(HAVE_QSCINTILLA, 1,
2650 [Define to 1 if the QScintilla library and header files are available]) 2650 [Define to 1 if the QScintilla library and header files are available])
2651
2652 save_CPPFLAGS="$CPPFLAGS"
2653 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS"
2654 AC_LANG_PUSH(C++)
2655 AC_CHECK_HEADERS([Qsci/qscilexeroctave.h Qsci/qscilexermatlab.h])
2656 AC_LANG_POP(C++)
2657 CPPFLAGS="$save_CPPFLAGS"
2651 fi 2658 fi
2652 2659
2653 AC_CHECK_FUNCS([setlocale], [], 2660 AC_CHECK_FUNCS([setlocale], [],
2654 [AC_MSG_WARN([setlocale not found -- disabling GUI]) 2661 [AC_MSG_WARN([setlocale not found -- disabling GUI])
2655 build_gui=no]) 2662 build_gui=no])