[Gnash-commit] gnash ChangeLog configure.ac

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/01/10 19:54:43

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        Don't allow OpenGL/FLTK.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2076&r2=1.2077
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.230&r2=1.231

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2076
retrieving revision 1.2077
diff -u -b -r1.2076 -r1.2077
--- ChangeLog   10 Jan 2007 19:27:35 -0000      1.2076
+++ ChangeLog   10 Jan 2007 19:54:43 -0000      1.2077
@@ -5,7 +5,7 @@
        * gui/{fltk_glue_cairo.cpp, fltk_glue_cairo.h}: Cairo glue for the
        FLTK GUI.
        * configure.ac: Allow the FLTK/Agg combination. Detect the FLTK
-       library when the FLTK GUI was selected.
+       library when the FLTK GUI was selected. Don't allow OpenGL/FLTK.
        * gui/Makefile.am: Build the FLTK GUI when requested.
        * gui/Player.cpp: Enable the FLTK GUI.
        * gui/gtk.cpp: Use an anonymous namespace for dbglogfile to avoid

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- configure.ac        10 Jan 2007 19:21:14 -0000      1.230
+++ configure.ac        10 Jan 2007 19:54:43 -0000      1.231
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.230 2007/01/10 19:21:14 bjacques Exp $
+dnl $Id: configure.ac,v 1.231 2007/01/10 19:54:43 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -180,8 +180,8 @@
 )
 
 if test x$renderer = xopengl; then
-  if test x"$gui" = xfb; then
-    AC_MSG_ERROR([opengl renderer is not supported by fb gui]);
+  if test x"$gui" = xfb -o x"$gui" = xfltk; then
+    AC_MSG_ERROR([opengl renderer is not supported by the $gui gui]);
   fi
   AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
 fi