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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/10 18:31:02

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        testsuite      : Makefile.am 
        testsuite/misc-swfc.all: Makefile.am 

Log message:
                * Makefile.am, configure.ac, testsuite/Makefile.am,
                  testsuite/misc-swfc.all/Makefile.am:
                  Enable swfc testsuite if 'swfc' is found on the system.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3987&r2=1.3988
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.396&r2=1.397
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3987
retrieving revision 1.3988
diff -u -b -r1.3987 -r1.3988
--- ChangeLog   10 Aug 2007 15:50:45 -0000      1.3987
+++ ChangeLog   10 Aug 2007 18:31:01 -0000      1.3988
@@ -1,4 +1,10 @@
-2007-08-09 David Rorex  <address@hidden>
+2007-08-10 Sandro Santilli <address@hidden>
+
+       * Makefile.am, configure.ac, testsuite/Makefile.am,
+         testsuite/misc-swfc.all/Makefile.am:
+         Enable swfc testsuite if 'swfc' is found on the system.
+
+2007-08-10 David Rorex  <address@hidden>
 
        * server/FreetypeGlyphsProvider.cpp: minor change to print the
          freetype glyph format in human readable form. patch #6148.

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- Makefile.am 7 Aug 2007 20:53:09 -0000       1.87
+++ Makefile.am 10 Aug 2007 18:31:01 -0000      1.88
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.87 2007/08/07 20:53:09 strk Exp $
+# $Id: Makefile.am,v 1.88 2007/08/10 18:31:01 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -186,6 +186,9 @@
 if ENABLE_SWFMILL
        @echo " SWFMILL $(SWFMILL) "
 endif
+if ENABLE_SWFC
+       @echo " SWFC $(SWFC) "
+endif
 if ENABLE_SWFDEC_TESTSUITE
        @echo " SWFDEC_TESTSUITE $(SWFDEC_TESTSUITE)"
 endif

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -b -r1.396 -r1.397
--- configure.ac        3 Aug 2007 20:25:30 -0000       1.396
+++ configure.ac        10 Aug 2007 18:31:01 -0000      1.397
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396 2007/08/03 20:25:30 strk Exp $
+dnl $Id: configure.ac,v 1.397 2007/08/10 18:31:01 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -952,14 +952,16 @@
 AM_CONDITIONAL(ENABLE_SWFDEC_TESTSUITE, [ test x"$SWFDEC_TESTSUITE" != x ])
 
 dnl
-dnl See if we can use the swfmill and mtasc based testsuites 
+dnl See if we can use the swfmill, mtasc and swfc based testsuites 
 dnl
 if test x$cross_compiling = xno; then
   AC_PATH_PROG(SWFMILL, swfmill)
+  AC_PATH_PROG(SWFC, swfc)
   AC_PATH_MTASC
 fi
 AM_CONDITIONAL(ENABLE_SWFMILL, [ test x"$SWFMILL" != x ])
 AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
+AM_CONDITIONAL(ENABLE_SWFC, [ test x"$SWFC" != x ])
 
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
@@ -1376,6 +1378,7 @@
 testsuite/misc-ming.all/Makefile
 testsuite/misc-mtasc.all/Makefile
 testsuite/misc-swfmill.all/Makefile
+testsuite/misc-swfc.all/Makefile
 testsuite/movies.all/Makefile
 testsuite/server/Makefile
 testsuite/libamf.all/Makefile
@@ -1997,6 +2000,15 @@
     echo "                 to run some of the tests in Gnash testsuite."
     echo "                 You can install it from 
http://iterative.org/swfmill/";
   fi
+
+  if test x"$SWFC" != x; then
+    echo "        SWFC is $SWFC"
+  else
+    echo "        WARNING: You need to have 'swfc' from SWFTools installed"
+    echo "                 to run some of the tests in Gnash testsuite."
+    echo "                 You can install it from http://www.swftools.org/";
+  fi
+
 fi
 
 if test x"$Z_LIBS" != x; then

Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- testsuite/Makefile.am       20 Jul 2007 14:28:34 -0000      1.40
+++ testsuite/Makefile.am       10 Aug 2007 18:31:01 -0000      1.41
@@ -12,6 +12,7 @@
        misc-ming.all \
        misc-mtasc.all \
        misc-swfmill.all \
+       misc-swfc.all \
        movies.all \
        actionscript.all \
        $(NULL)

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/Makefile.am 9 Aug 2007 06:38:16 -0000       1.1
+++ testsuite/misc-swfc.all/Makefile.am 10 Aug 2007 18:31:01 -0000      1.2
@@ -34,7 +34,7 @@
 
 #if ENABLE_SWFC
 
-SWFC = swfc
+#SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 
 SWFC_CPP = cpp -P -I$(srcdir)