Mercurial > octave
changeset 21802:66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
FLTK needs C++ to compile so this check always failed whether
the OpenGL headers were present or not in FL.
| author | Andreas Weber <andy.weber.aw@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2016 09:08:40 +0200 |
| parents | 4acfe6a99a9f |
| children | bc266f3134d7 |
| files | configure.ac |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue May 31 16:49:46 2016 +0200 +++ b/configure.ac Thu Jun 02 09:08:40 2016 +0200 @@ -1615,7 +1615,7 @@ FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | $SED -e 's/-mwindows//g'` ;; esac - + AC_LANG_PUSH(C++) AC_CACHE_CHECK([for OpenGL support in FLTK], [octave_cv_fltk_opengl_support], [save_CPPFLAGS="$CPPFLAGS" @@ -1625,8 +1625,8 @@ ]], [[ int nothing = 0; ]])], - octave_cv_fltk_opengl_support=no, - octave_cv_fltk_opengl_support=yes) + octave_cv_fltk_opengl_support=yes, + octave_cv_fltk_opengl_support=no) CPPFLAGS="$save_CPPFLAGS" ]) if test $octave_cv_fltk_opengl_support = no; then @@ -1635,6 +1635,7 @@ build_fltk_graphics=yes AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) fi + AC_LANG_POP(C++) if test -n "$warn_fltk_opengl"; then OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl])