[Gnash-commit] gnash ChangeLog Makefile.am configure.ac macros...

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        macros         : agg.m4 

Log message:
        * configure.ac, Makefile.am, macros/agg.m4: report need for AGG 
compatibility layer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1147&r2=1.1148
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1147
retrieving revision 1.1148
diff -u -b -r1.1147 -r1.1148
--- ChangeLog   11 Oct 2006 16:04:26 -0000      1.1147
+++ ChangeLog   11 Oct 2006 16:25:12 -0000      1.1148
@@ -1,5 +1,10 @@
 2006-10-11 Sandro Santilli <address@hidden>
 
+       * configure.ac, Makefile.am, macros/agg.m4: report need for
+         AGG compatibility layer.
+
+2006-10-11 Sandro Santilli <address@hidden>
+
        * macros/gtkglext.m4: added missing -L to GLEXT_LIBS when
        --with-glext-lib is given
        * backend/render_handler_agg.cpp:

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- Makefile.am 7 Oct 2006 14:20:27 -0000       1.38
+++ Makefile.am 11 Oct 2006 16:25:12 -0000      1.39
@@ -151,6 +151,7 @@
        @echo "BOOST_LIBS is $(BOOST_LIBS)"
        @echo "AGG_CFLAGS is $(AGG_CFLAGS)"
        @echo "AGG_LIBS is $(AGG_LIBS)"
+       @echo "AGG_NEEDS_COMPATIBILITY_LAYER ? $(agg_need_compatibility_layer)"
        @echo "A blank value for CFLAGS means the header is installed in the"
        @echo "default system header location. All the LIBS should have a"
        @echo "legit value"

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- configure.ac        11 Oct 2006 14:50:16 -0000      1.148
+++ configure.ac        11 Oct 2006 16:25:12 -0000      1.149
@@ -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.148 2006/10/11 14:50:16 strk Exp $
+dnl $Id: configure.ac,v 1.149 2006/10/11 16:25:12 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -1105,6 +1105,7 @@
         echo "        AGG flags are: default include path"
       fi
       echo "        AGG libs are: $AGG_LIBS"
+      echo "          needs compatibility layer: $agg_need_compatibility_layer"
     else
       echo "ERROR: No AGG development package installed!\
  You need to have the AGG development package installed\

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/agg.m4       11 Oct 2006 15:50:32 -0000      1.10
+++ macros/agg.m4       11 Oct 2006 16:25:12 -0000      1.11
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: agg.m4,v 1.10 2006/10/11 15:50:32 strk Exp $
+dnl $Id: agg.m4,v 1.11 2006/10/11 16:25:12 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 
@@ -139,6 +139,8 @@
        [ agg_need_compatibility_layer="no" ],
        [ agg_need_compatibility_layer="yes" ] )
 
+  AC_SUBST(agg_need_compatibility_layer)
+
   if test x"${agg_need_compatibility_layer}" = xyes; then
        AC_DEFINE(HAVE_AGG_SCANLINES_COMPOUND_LAYERED, [0], [AGG headers 
include the render_scanlines_compound_layered templated function])
   else