[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp 
        macros         : agg.m4 

Log message:
                * backend/render_handler_agg.cpp:
                  use HAVE_AGG_SCANLINES_COMPOUND_LAYERED define to toggle 
inclusion
                  of compatibility header.
                * macros/agg.m4: check availability of the                      
                  render_scanlines_coumpound_layered function and set
                  HAVE_AGG_SCANLINES_COMPOUND_LAYERED accordingly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1145&r2=1.1146
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1145
retrieving revision 1.1146
diff -u -b -r1.1145 -r1.1146
--- ChangeLog   11 Oct 2006 15:45:17 -0000      1.1145
+++ ChangeLog   11 Oct 2006 15:50:32 -0000      1.1146
@@ -1,5 +1,11 @@
 2006-10-11 Sandro Santilli <address@hidden>
 
+       * backend/render_handler_agg.cpp:
+         use HAVE_AGG_SCANLINES_COMPOUND_LAYERED define to toggle inclusion
+         of compatibility header.
+       * macros/agg.m4: check availability of the
+         render_scanlines_coumpound_layered function and set
+         HAVE_AGG_SCANLINES_COMPOUND_LAYERED accordingly.
        * configure.ac: exit with error on invalid gui/renderer selection
          combination.
 

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- backend/render_handler_agg.cpp      10 Oct 2006 14:02:48 -0000      1.14
+++ backend/render_handler_agg.cpp      11 Oct 2006 15:50:32 -0000      1.15
@@ -34,7 +34,7 @@
 // forward this exception.
  
 
-/* $Id: render_handler_agg.cpp,v 1.14 2006/10/10 14:02:48 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.15 2006/10/11 15:50:32 strk Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -99,7 +99,9 @@
 #include "agg_scanline_p.h"
 #include "agg_renderer_scanline.h"
 // must only include if render_scanlines_compound_layered is not defined
-//#include "render_handler_agg_compat.h"
+#if ! HAVE_AGG_SCANLINES_COMPUND_LAYEDER
+#include "render_handler_agg_compat.h"
+#endif
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_rasterizer_compound_aa.h"
 #include "agg_span_allocator.h"

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/agg.m4       11 Oct 2006 00:16:58 -0000      1.9
+++ macros/agg.m4       11 Oct 2006 15:50:32 -0000      1.10
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: agg.m4,v 1.9 2006/10/11 00:16:58 nihilus Exp $
+dnl $Id: agg.m4,v 1.10 2006/10/11 15:50:32 strk Exp $
 
 dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
 dnl but not in AGG 2.3. As we need AGG 2.4, we use this as 
@@ -47,6 +47,7 @@
   if test x"${with_agg_incl}" != x ; then
     if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
       ac_cv_path_agg_incl="-I`(cd ${with_agg_incl}; pwd)`"
+      agg_include_dir=${with_agg_incl}
       agg24=yes
     else
       AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
@@ -62,6 +63,7 @@
     for i in $incllist; do
       if test -f $i/agg2/agg_rasterizer_compound_aa.h; then
         ac_cv_path_agg_incl="-I$i/agg2"
+       agg_include_dir=$i
        AC_MSG_RESULT([${ac_cv_path_agg_incl} (agg24 detected)])
        agg24=yes
         break
@@ -132,13 +134,15 @@
       AGG_LIBS="-lagg"
   fi
 
-  AC_LANG_PUSH(C++)
-  AC_CHECK_LIB(agg, agg::render_scanlines_compound_layered,
-       [agg_need_compatibility_layer="yes"],
-       [agg_need_compatibility_layer="no"])
+  AC_EGREP_HEADER(render_scanlines_compound_layered, 
+       ${agg_include_dir}/agg_renderer_scanline.h,
+       [ agg_need_compatibility_layer="no" ],
+       [ agg_need_compatibility_layer="yes" ] )
 
   if test x"${agg_need_compatibility_layer}" = xyes; then
-       echo "Need compatibility layer";
+       AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [0], [AGG headers 
include the render_scanlines_compound_layered templated function])
+  else
+       AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [1], [AGG headers 
include the render_scanlines_compound_layered templated function])
   fi
 
   AC_SUBST(AGG_LIBS)