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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/18 17:35:33

Modified files:
        .              : ChangeLog 
        macros         : agg.m4 

Log message:
        * macros/agg.m4: make sure agg_include_dir is an absolute path.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1305&r2=1.1306
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1305
retrieving revision 1.1306
diff -u -b -r1.1305 -r1.1306
--- ChangeLog   18 Oct 2006 17:29:57 -0000      1.1305
+++ ChangeLog   18 Oct 2006 17:35:33 -0000      1.1306
@@ -1,3 +1,7 @@
+2006-10-18 Sandro Santilli <address@hidden>
+
+       * macros/agg.m4: make sure agg_include_dir is an absolute path.
+
 2006-10-18 Stefan Schweizer <address@hidden>
 
        * gui/Makefile.am: klash_DEPENDENCIES += libgnashplayer.la.

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/agg.m4       15 Oct 2006 14:26:05 -0000      1.14
+++ macros/agg.m4       18 Oct 2006 17:35:33 -0000      1.15
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: agg.m4,v 1.14 2006/10/15 14:26:05 bjacques Exp $
+dnl $Id: agg.m4,v 1.15 2006/10/18 17:35:33 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,7 +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}
+      agg_include_dir="`(cd ${with_agg_incl}; pwd)`"
       agg24=yes
     else
       AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
@@ -59,6 +59,7 @@
  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.4.0 libagg 
&& agg24=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'`
   fi
   AC_MSG_CHECKING([for AGG headers])