[Gnash-commit] gnash configure.ac

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/05/21 08:39:35

Modified files:
        .              : configure.ac 

Log message:
        Revert unintended commit leftover from cvs update -C not doing what it 
claims to do.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.534&r2=1.535

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -b -r1.534 -r1.535
--- configure.ac        21 May 2008 08:31:01 -0000      1.534
+++ configure.ac        21 May 2008 08:39:35 -0000      1.535
@@ -1775,18 +1775,12 @@
   if test x$build_fb = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by FB gui. Use 
--enable-renderer=AGG]);
   fi
-<<<<<<< configure.ac
-dnl  if test x$build_fltk = xyes; then
-dnl    AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use 
--enable-renderer=AGG]);
-dnl  fi
-=======
   if test x$build_sdl = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by SDL gui. Use 
--enable-renderer=AGG]);
   fi
   if test x$build_fltk = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by FLTK gui. Use 
--enable-renderer=AGG]);
   fi
->>>>>>> 1.533
   if test x$build_kde = xyes; then
     AC_MSG_ERROR([Cairo renderer is not supported by KDE gui. Use 
--enable-renderer=AGG]);
   fi