Mercurial > octave

diff m4/acinclude.m4 @ 22257:945e7f9c11ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: fix configure --without-qt or --with-qt * configure.ac (AC_ARG_WITH([qt])): Rewrite to handle --with-qt case. Display two help strings for --with-qt=N and --without-qt options. (QT_VERSIONS): Set to empty on --without-qt. (check_qt): Delete. (OCTAVE_CHECK_QT) Call unconditionally to ensure AM_CONDITIONALs are set. * acinclude.m4 (OCTAVE_CHECK_QT): Ensure build_qt_gui, build_qt_graphics, use_qscintilla, and win32_terminal are defined even if no Qt versions are checked.
author Mike Miller <mtmiller@octave.org>
date Wed, 10 Aug 2016 10:59:14 -0700
parents 8e18e364a686
children f394436a4025
line wrap: on
line diff
--- a/m4/acinclude.m4	Wed Aug 10 12:29:59 2016 -0400
+++ b/m4/acinclude.m4	Wed Aug 10 10:59:14 2016 -0700
@@ -1557,6 +1557,12 @@
 dnl
 AC_DEFUN([OCTAVE_CHECK_QT], [
   octave_qt_versions="$1"
+
+  build_qt_gui=no
+  build_qt_graphics=no
+  use_qscintilla=no
+  win32_terminal=no
+
   for ver in $octave_qt_versions; do
     OCTAVE_CHECK_QT_VERSION([$ver])
     if test $build_qt_gui = yes; then