Mercurial > octave

changeset 24143:25ccc1f8092d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: fix test for QOpenGLWidget headers when tests are cached * acinclude.m4 (OCTAVE_CHECK_QT_OPENGL_OK): Move AC_CHECK_HEADERS out of the scope of the possibly-cached compilation test.
author Mike Miller <mtmiller@octave.org>
date Fri, 13 Oct 2017 12:29:02 -0700
parents 59cdf06c940e
children 8e034cb195f1
files m4/acinclude.m4
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/m4/acinclude.m4	Fri Oct 13 13:22:09 2017 -0400
+++ b/m4/acinclude.m4	Fri Oct 13 12:29:02 2017 -0700
@@ -1335,6 +1335,7 @@
 dnl Check whether Qt works with full OpenGL support
 dnl
 AC_DEFUN([OCTAVE_CHECK_QT_OPENGL_OK], [
+  AC_CHECK_HEADERS([QOpenGLWidget QGLWidget])
   AC_CACHE_CHECK([whether Qt works with OpenGL and GLU],
     [octave_cv_qt_opengl_ok],
     [AC_LANG_PUSH(C++)
@@ -1342,7 +1343,6 @@
      ac_octave_save_CXXFLAGS="$CXXFLAGS"
      CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
      CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
-     AC_CHECK_HEADERS([QOpenGLWidget QGLWidget])
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
          #if HAVE_WINDOWS_H
          #  include <windows.h>