[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/29 03:39:15

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        Ops, I blanked out RENDERER_OGL define. This commit also fixes the 
check for the GUI that actually support OGL renderer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3854&r2=1.3855
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.377&r2=1.378

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3854
retrieving revision 1.3855
diff -u -b -r1.3854 -r1.3855
--- ChangeLog   29 Jul 2007 03:22:03 -0000      1.3854
+++ ChangeLog   29 Jul 2007 03:39:15 -0000      1.3855
@@ -1,8 +1,9 @@
 2007-07-28 Sandro Santilli <address@hidden>
 
        * configure.ac: don't miss to set add_renderer when no
-         --enable-renderer is given, and don't abort if flkt or fb
-         guis are picked up with opengl renderer.
+         --enable-renderer is given, and only abort complaining if NO
+         GUI supporting opengl is built while also requesting to build opengl
+         renderer.
 
 2007-07-28 Sandro Santilli <address@hidden>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -b -r1.377 -r1.378
--- configure.ac        29 Jul 2007 03:22:04 -0000      1.377
+++ configure.ac        29 Jul 2007 03:39:15 -0000      1.378
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.377 2007/07/29 03:22:04 strk Exp $
+dnl $Id: configure.ac,v 1.378 2007/07/29 03:39:15 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -357,12 +357,13 @@
    add_renderer="ogl,agg"
 fi
 
-dnl if test x$build_ogl = xyes; then
+if test x$build_ogl = xyes; then
 dnl   if test x$build_fb = xyes -o x$build_fltk = xyes; then
-dnl     AC_MSG_ERROR([OpenGL renderer is not supported by the this gui. Try 
using AGG ( --enable-renderer=AGG ).]);
-dnl   fi
-dnl   AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
-dnl fi
+   if test x$build_gtk != xyes -a x$build_fltk != xyes -a x$build_kde != xyes; 
then
+     AC_MSG_ERROR([OpenGL renderer is not supported by the this gui. Try using 
AGG ( --enable-renderer=AGG ).]);
+   fi
+   AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
+fi
 
 dnl 16 bit: RGB555, RGB565
 dnl 24 bit: RGB24, BGR24