comparison configure.ac @ 19622:722ff3e45bea gui-release

build: Don't build GUI when OpenGL is disabled or not found (bug #44017) * configure.ac: Disable building the GUI when OpenGL libraries are not found or are intentionally disabled.
author Mike Miller <mtmiller@ieee.org>
date Sun, 18 Jan 2015 17:53:41 -0500
parents f550bf908f47
children 37d37297acf8 fe689210525c
comparison
equal deleted inserted replaced
19621:7bb80c927af5 19622:722ff3e45bea
2717 win32_terminal=no 2717 win32_terminal=no
2718 build_gui=yes 2718 build_gui=yes
2719 AC_ARG_ENABLE([gui], 2719 AC_ARG_ENABLE([gui],
2720 [AS_HELP_STRING([--disable-gui], [don't build the GUI])], 2720 [AS_HELP_STRING([--disable-gui], [don't build the GUI])],
2721 [if test "$enableval" = no; then build_gui=no; fi], []) 2721 [if test "$enableval" = no; then build_gui=no; fi], [])
2722
2723 if test -z "$OPENGL_LIBS"; then
2724 build_gui=no
2725 if test $check_opengl = yes; then
2726 warn_gui="OpenGL libs (GL and GLU) not found -- disabling GUI"
2727 else
2728 warn_gui="--without-opengl was specified -- disabling GUI"
2729 fi
2730 OCTAVE_CONFIGURE_WARNING([warn_gui])
2731 fi
2722 2732
2723 if test $build_gui = yes; then 2733 if test $build_gui = yes; then
2724 2734
2725 warn_gui="" 2735 warn_gui=""
2726 ## Check for Qt libraries 2736 ## Check for Qt libraries