Mercurial > octave

changeset 21512:79aa496c6d47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Fix configure warning messages on missing OpenGL graphics support * configure.ac (build_fltk_graphics): New variable, set when FLTK OpenGL support is present and working. (opengl_graphics): Set based on values of build_fltk_graphics and build_qt_graphics shell variables.
author Mike Miller <mtmiller@octave.org>
date Mon, 21 Mar 2016 15:54:53 -0700
parents e1c5aca1c798
children 6bf7f41afea6
files configure.ac
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Mon Mar 21 15:01:12 2016 -0700
+++ b/configure.ac	Mon Mar 21 15:54:53 2016 -0700
@@ -1552,6 +1552,8 @@
 ## Check for FLTK (www.fltk.org) library
 
 check_fltk=yes
+build_fltk_graphics=no
+
 AC_ARG_WITH([fltk],
   [AS_HELP_STRING([--without-fltk],
     [don't use FLTK libraries, disable OpenGL graphics with FLTK widgets])],
@@ -1626,6 +1628,7 @@
     if test $octave_cv_fltk_opengl_support = no; then
       warn_fltk_opengl="FLTK does not have OpenGL support.  OpenGL graphics with FLTK widgets will be disabled."
     else
+      build_fltk_graphics=yes
       AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.])
     fi
 
@@ -1639,7 +1642,7 @@
 AC_SUBST(FLTK_LDFLAGS)
 AC_SUBST(FLTK_LIBS)
 
-if test -n "$warn_qt_opengl" && test -n "$warn_fltk_opengl"; then
+if test $build_qt_graphics = no && test $build_fltk_graphics = no; then
   opengl_graphics=no
 else
   opengl_graphics=yes