[Gnash-commit] gnash configure.ac macros/agg.m4 macros/kde.m4

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/01/09 18:19:15

Modified files:
        .              : configure.ac 
        macros         : agg.m4 kde.m4 

Log message:
                * configure.ac: Fix typo. Comment out configure output regarding
                the Agg compatibility layer, as it appears to be unused.
                * macros/agg.m4: 'test' Can have only one instance of the -a
                argument, so add a separate test and match indentation.
                * macros/kde.m4: Stop trying to use the undefined 
GNASH_PATH_ZLIB
                and instead rely on the ZLIB macro which configure executes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.228&r2=1.229
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -b -r1.228 -r1.229
--- configure.ac        9 Jan 2007 00:43:43 -0000       1.228
+++ configure.ac        9 Jan 2007 18:19:15 -0000       1.229
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.228 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: configure.ac,v 1.229 2007/01/09 18:19:15 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1320,7 +1320,7 @@
 fi
 
 if test x$renderer = xagg; then
-  if test x$agg24 = xyes; then
+  if test x"${agg25}" = xyes; then
     if test x"$AGG_LIBS" != x; then
       if test x"$AGG_CFLAGS" != x; then
         echo "        AGG flags are: $AGG_CFLAGS"
@@ -1328,7 +1328,7 @@
         echo "        AGG flags are: default include path"
       fi
       echo "        AGG libs are: $AGG_LIBS"
-      echo "          needs compatibility layer: $agg_need_compatibility_layer"
+dnl      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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/agg.m4       9 Jan 2007 02:02:42 -0000       1.23
+++ macros/agg.m4       9 Jan 2007 18:19:15 -0000       1.24
@@ -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.23 2007/01/09 02:02:42 bjacques Exp $
+dnl $Id: agg.m4,v 1.24 2007/01/09 18:19:15 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,7 +36,8 @@
   ])
 
   if test x$cross_compiling = xno; then
-    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_incl}" = x -a 
$PKG_CONFIG --exists libagg ; then
+    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_incl}" = x; then
+      if $PKG_CONFIG --exists libagg ; then
       ac_cv_path_agg_incl=`$PKG_CONFIG --cflags libagg`
       $PKG_CONFIG --atleast-version 2.5.0 libagg && agg25=yes
  
@@ -47,6 +48,7 @@
       fi
     fi
   fi
+  fi
 
   if test x"${ac_cv_path_agg_incl}" = x; then
     AC_MSG_CHECKING([for AGG headers])

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/kde.m4       9 Jan 2007 00:43:43 -0000       1.24
+++ macros/kde.m4       9 Jan 2007 18:19:15 -0000       1.25
@@ -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: kde.m4,v 1.24 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: kde.m4,v 1.25 2007/01/09 18:19:15 bjacques Exp $
 
 dnl ------------------------------------------------------------------------
 dnl Find a file (or one of more files in a list of dirs)
@@ -2119,8 +2119,7 @@
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
-GNASH_PATH_ZLIB
-LIBZ=$ZLIB_LIBS
+LIBZ=$Z_LIBS
 AC_SUBST(LIBZ)
 ])