Mercurial > octave

changeset 11208:a44ba1cdfbb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle --without-opengl configure option
author John W. Eaton <jwe@octave.org>
date Mon, 08 Nov 2010 22:28:06 -0500
parents 51e6ac3e5afc
children 94d9d412a2a0
files ChangeLog configure.ac
diffstat 2 files changed, 25 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 08 21:22:22 2010 +0100
+++ b/ChangeLog	Mon Nov 08 22:28:06 2010 -0500
@@ -1,3 +1,7 @@
+2010-11-08  John W. Eaton  <jwe@octave.org>
+
+	* configure.ac (--without-opengl): New configure option.
+
 2010-11-03  John W. Eaton  <jwe@octave.org>
 
 	* bootstrap.conf (gnulib_modules): Include copysign in the list.
--- a/configure.ac	Mon Nov 08 21:22:22 2010 +0100
+++ b/configure.ac	Mon Nov 08 22:28:06 2010 -0500
@@ -826,7 +826,21 @@
 
 warn_freetype=""
 
-OCTAVE_OPENGL
+check_opengl=false
+AC_ARG_WITH([opengl],
+  [AS_HELP_STRING([--with-opengl=yes], [use opengl library for graphics])],
+  [if test "x$withval" = xno; then
+     warn_opengl="--without-opengl specified.  Native graphics will be disabled."
+     AC_MSG_WARN([$warn_opengl])
+   else
+     check_opengl=true
+   fi],
+  [check_opengl=true])
+
+if $check_opengl; then
+  OCTAVE_OPENGL
+fi
+
 GRAPHICS_LIBS=
 GRAPHICS_CFLAGS=
 
@@ -2377,6 +2391,12 @@
 fi
 
 native_graphics=true
+if test -n "warn_opengl"; then
+  AC_MSG_WARN([$warn_opengl])
+  native_graphics=false
+  warn_msg_printed=true
+fi
+
 if test -n "$warn_freetype"; then
   AC_MSG_WARN([$warn_freetype])
   native_graphics=false