[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/11 14:50:16

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        configure.ac: exit with error on invalid gui/renderer selection 
combination.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1143&r2=1.1144
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.147&r2=1.148

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1143
retrieving revision 1.1144
diff -u -b -r1.1143 -r1.1144
--- ChangeLog   11 Oct 2006 14:44:32 -0000      1.1143
+++ ChangeLog   11 Oct 2006 14:50:16 -0000      1.1144
@@ -1,3 +1,8 @@
+2006-10-11 Sandro Santilli <address@hidden>
+
+       * configure.ac: exit with error on invalid gui/renderer selection
+         combination.
+
 2006-10-11 Markus Gothe <address@hidden>
 
        * backend/Makefile.am, testsuite/Makefile.am, gui/Makefile.am,

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- configure.ac        11 Oct 2006 10:32:39 -0000      1.147
+++ configure.ac        11 Oct 2006 14:50:16 -0000      1.148
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.147 2006/10/11 10:32:39 strk Exp $
+dnl $Id: configure.ac,v 1.148 2006/10/11 14:50:16 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -201,16 +201,25 @@
 )
 
 if test x$renderer = xopengl; then
+  if test x"$gui" = xfb; then
+    AC_MSG_ERROR([opengl renderer is not supported by fb gui]);
+  fi
   AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
 fi
 AM_CONDITIONAL(USE_RENDERER_OPENGL, test x$renderer = xopengl)
 
 if test x$renderer = xcairo; then
+  if test x"$gui" = xfb; then
+    AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
+  fi
   AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
 fi
 AM_CONDITIONAL(USE_RENDERER_CAIRO, test x$renderer = xcairo)
 
 if test x$renderer = xagg; then
+  if test x"$gui" != xfb; then
+    AC_MSG_ERROR([agg renderer is only supported by fb gui]);
+  fi
   AC_DEFINE([RENDERER_AGG], [], [Use AntiGrain renderer])
 fi
 AM_CONDITIONAL(USE_RENDERER_AGG, test x$renderer = xagg)