[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog configure.ac 

Log message:
                * 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.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3853
retrieving revision 1.3854
diff -u -b -r1.3853 -r1.3854
--- ChangeLog   28 Jul 2007 22:01:56 -0000      1.3853
+++ ChangeLog   29 Jul 2007 03:22:03 -0000      1.3854
@@ -1,5 +1,11 @@
 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.
+
+2007-07-28 Sandro Santilli <address@hidden>
+
        * configure.ac: proper quote args given to test (in the code
          snippet handling --enable-gui)
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -b -r1.376 -r1.377
--- configure.ac        28 Jul 2007 22:01:56 -0000      1.376
+++ configure.ac        29 Jul 2007 03:22:04 -0000      1.377
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.376 2007/07/28 22:01:56 strk Exp $
+dnl $Id: configure.ac,v 1.377 2007/07/29 03:22:04 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -354,15 +354,15 @@
 if test x$add_renderer = x; then
    build_ogl=yes
    build_agg=yes
-dnl   add_renderer="ogl,agg"
+   add_renderer="ogl,agg"
 fi
 
-if test x$build_ogl = xyes; then
-  if test x$build_fb = xyes -o x$build_fltk = 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 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
 
 dnl 16 bit: RGB555, RGB565
 dnl 24 bit: RGB24, BGR24
@@ -1252,6 +1252,7 @@
 for rend in `echo "${add_renderer}" | tr ',' ' '`; do
        RENDERER_LIBS="${RENDERER_LIBS} 
\$(top_builddir)/backend/libgnash${rend}.la"
 done
+dnl echo "RENDERER_LIBS=$RENDERER_LIBS"
 AC_SUBST(RENDERER_LIBS)
 AC_SUBST(RENDERER_CONFIG)