# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1289331150 28800
# Node ID 7f19b2b6e09386fdcd46ae84bf68104e4c28d5f9
# Parent  009d16b010fa3725f42dbf15ed18e8f3001d72a8
Remove redundant warning when 'without-opengl' option used.

diff -r 009d16b010fa -r 7f19b2b6e093 ChangeLog
--- a/ChangeLog	Tue Nov 09 13:21:15 2010 -0500
+++ b/ChangeLog	Tue Nov 09 11:32:30 2010 -0800
@@ -1,3 +1,8 @@
+2010-11-09  Rik  <octave@nomad.inbox5.com>
+
+	* configure.ac: Remove redundant warning message when '--without-opengl'
+	option used.
+
 2010-11-09  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac: Don't check for trunc, copysign, or _copysign.
diff -r 009d16b010fa -r 7f19b2b6e093 configure.ac
--- a/configure.ac	Tue Nov 09 13:21:15 2010 -0500
+++ b/configure.ac	Tue Nov 09 11:32:30 2010 -0800
@@ -828,7 +828,7 @@
 
 check_opengl=false
 AC_ARG_WITH([opengl],
-  [AS_HELP_STRING([--with-opengl=yes], [use opengl library for graphics])],
+  [AS_HELP_STRING([--without-opengl], [don't use OpenGL libraries, disable native graphics])],
   [if test "x$withval" = xno; then
      warn_opengl="--without-opengl specified.  Native graphics will be disabled."
      AC_MSG_WARN([$warn_opengl])
@@ -844,6 +844,12 @@
 GRAPHICS_LIBS=
 GRAPHICS_CFLAGS=
 
+if test -z "$OPENGL_LIBS"; then
+  if $check_opengl; then
+    warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled."
+  fi
+fi
+
 if test -n "$OPENGL_LIBS"; then
   AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available])
 
@@ -928,8 +934,6 @@
       AC_MSG_RESULT(no)
     fi
   fi
-else
-  warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled."
 fi
 
 AC_SUBST(GRAPHICS_CFLAGS)