Mercurial > octave-nkf
changeset 16296:ef39f8b1c5c8
configure.ac: Unconditionally define AMCOND_HAVE_QSCINTILLA.
* configure.ac: Move macro definition for AMCOND_HAVE_QSCINTILLA out
of conditional block so that it is always defined.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 13 Mar 2013 09:08:10 -0700 |
| parents | 4a1300ed5d3c |
| children | 00da706fba48 |
| files | configure.ac |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Mar 13 08:28:16 2013 -0700 +++ b/configure.ac Wed Mar 13 09:08:10 2013 -0700 @@ -2623,8 +2623,6 @@ AC_DEFINE(HAVE_QSCINTILLA, 1, [Define to 1 if the QScintilla library and header files are available]) fi - AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], - [test $octave_cv_lib_qscintilla = yes]) AC_CHECK_FUNCS([setlocale], [], [AC_MSG_WARN([setlocale not found -- disabling GUI]) @@ -2655,6 +2653,7 @@ GUIDIR= fi AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) +AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $octave_cv_lib_qscintilla = yes]) AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) AC_SUBST(QT_CPPFLAGS) AC_SUBST(QT_LDFLAGS)