[Gnash-commit] /srv/bzr/gnash/trunk r11969: Add an SWFMILL_FUNCTION2_FLAGS_ORDER_CORRECT conditional based on swfmill version, skip tests in trace-as2 if that's not met

[Sandro Santilli]

------------------------------------------------------------
revno: 11969
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-24 22:46:20 +0100
message:
  Add an SWFMILL_FUNCTION2_FLAGS_ORDER_CORRECT conditional based on swfmill 
version, skip tests in trace-as2 if that's not met
modified:
  configure.ac
  testsuite/misc-swfmill.all/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2010-02-08 00:05:16 +0000
+++ b/configure.ac      2010-02-24 21:46:20 +0000
@@ -1817,6 +1817,10 @@
 AM_CONDITIONAL(SWFMILL_AS3_SUPPORT,
         [ test x"$SWFMILL" != x && test $SWFMILL_VERSION -ge 00021206 ])
 
+dnl SWFMILL versions older than 0.3 didn't get function2 flags order correctly
+AM_CONDITIONAL(SWFMILL_FUNCTION2_FLAGS_ORDER_CORRECT,
+        [ test x"$SWFMILL" != x && test $SWFMILL_VERSION -ge 00030000 ])
+
 AM_CONDITIONAL(ENABLE_AS3COMPILE, [ test x"$AS3COMPILE" != x ])
 AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
 AM_CONDITIONAL(ENABLE_HAXE, [ test x"$HAXE" != x ])

=== modified file 'testsuite/misc-swfmill.all/Makefile.am'
--- a/testsuite/misc-swfmill.all/Makefile.am    2010-01-01 17:48:26 +0000
+++ b/testsuite/misc-swfmill.all/Makefile.am    2010-02-24 21:46:20 +0000
@@ -27,7 +27,11 @@
 endif
 endif
 
-SUBDIRS = trace-as2 $(DIR_TRACE_AS3)
+if SWFMILL_FUNCTION2_FLAGS_ORDER_CORRECT
+DIR_TRACE_AS2 = trace-as2
+endif
+
+SUBDIRS = $(DIR_TRACE_AS2) $(DIR_TRACE_AS3)
 
 DIST_SUBDIRS = \
        trace-as2 \