[Gnash-commit] gnash ChangeLog macros/agg.m4

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/01/09 02:02:42

Modified files:
        .              : ChangeLog 
        macros         : agg.m4 

Log message:
        When pkg-config is available and it knows Agg,
                  check for the agg-2.5 header in case we're dealing with an
                  improperly named Agg package.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2057&r2=1.2058
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2057
retrieving revision 1.2058
diff -u -b -r1.2057 -r1.2058
--- ChangeLog   9 Jan 2007 01:49:00 -0000       1.2057
+++ ChangeLog   9 Jan 2007 02:02:42 -0000       1.2058
@@ -1,3 +1,9 @@
+2007-01-09 Bastiaan Jacques <address@hidden>
+
+       * macros/agg.m4: When pkg-config is available and it knows Agg,
+         check for the agg-2.5 header in case we're dealing with an
+         improperly named Agg package.
+
 2007-01-08 Sandro Santilli <address@hidden>
 
        * server/as_environment.h: add num_local_registers() and

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- macros/agg.m4       9 Jan 2007 00:43:43 -0000       1.22
+++ macros/agg.m4       9 Jan 2007 02:02:42 -0000       1.23
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: agg.m4,v 1.22 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: agg.m4,v 1.23 2007/01/09 02:02:42 bjacques 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 
@@ -36,11 +36,15 @@
   ])
 
   if test x$cross_compiling = xno; then
-    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_incl}" = x; then
-      $PKG_CONFIG --exists libagg && ac_cv_path_agg_incl=`$PKG_CONFIG --cflags 
libagg`
-      $PKG_CONFIG --exists libagg && $PKG_CONFIG --atleast-version 2.5.0 
libagg && agg25=yes
+    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_incl}" = x -a 
$PKG_CONFIG --exists libagg ; then
+      ac_cv_path_agg_incl=`$PKG_CONFIG --cflags libagg`
+      $PKG_CONFIG --atleast-version 2.5.0 libagg && agg25=yes
+ 
        dnl I think this setting of agg_include_dir is too error prone!
-      $PKG_CONFIG --exists libagg && agg_include_dir=`$PKG_CONFIG 
--cflags-only-I libagg | cut -d " " -f 1 | sed -e 's/-I//g'`
+      agg_include_dir=`$PKG_CONFIG --cflags-only-I libagg | cut -d " " -f 1 | 
sed -e 's/-I//g'`
+      if test -f $agg_include_dir/agg_gradient_lut.h ; then
+        agg25=yes
+      fi
     fi
   fi