[Gnash-commit] gnash ChangeLog configure.ac libbase/rc.cpp tes...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/09/13 18:33:20

Modified files:
        .              : ChangeLog configure.ac 
        libbase        : rc.cpp 
        testsuite/misc-ming.all: Makefile.am 

Log message:
        * configure.ac (sorry for the rebuilding ...), 
testsuite/misc-ming.all/Makefile.am: add conditional for Ming version at least 
0.4 before building get_frame test* libbase/rc.cpp: set writelog off by default 
(bug #21037).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4307&r2=1.4308
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.413&r2=1.414
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.152&r2=1.153

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4307
retrieving revision 1.4308
diff -u -b -r1.4307 -r1.4308
--- ChangeLog   13 Sep 2007 16:26:13 -0000      1.4307
+++ ChangeLog   13 Sep 2007 18:33:19 -0000      1.4308
@@ -1,3 +1,10 @@
+2007-09-13 Benjamin Wolsey <address@hidden>
+
+       * configure.ac, testsuite/misc-ming.all/Makefile.am: add conditional
+         for Ming version at least 0.4 before building get_frame test.
+       * libbase/rc.cpp: set writelog off by default (bug #21037).
+
+
 2007-09-13 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp (restart): don't call construct again, to

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -b -r1.413 -r1.414
--- configure.ac        4 Sep 2007 08:21:41 -0000       1.413
+++ configure.ac        13 Sep 2007 18:33:19 -0000      1.414
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.413 2007/09/04 08:21:41 bwy Exp $
+dnl $Id: configure.ac,v 1.414 2007/09/13 18:33:19 bwy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -960,6 +960,9 @@
   AC_PATH_MING
 fi
 AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
+
+AM_CONDITIONAL(MING_VERSION_0_4,
+        [ test x"$MAKESWF" != x && test $MING_VERSION_CODE -ge 00040000  ])
 AM_CONDITIONAL(MAKESWF_SUPPORTS_PREBUILT_CLIPS,
         [ test x"$MAKESWF" != x && test $MING_VERSION_CODE -ge 00040002  ])
 AM_CONDITIONAL(MING_SUPPORTS_INIT_ACTIONS,

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libbase/rc.cpp      23 Aug 2007 09:37:22 -0000      1.33
+++ libbase/rc.cpp      13 Sep 2007 18:33:20 -0000      1.34
@@ -70,6 +70,7 @@
                            _localdomain_only(false),
                            _localhost_only(false),
                            _log("gnash-dbg.log"),
+                          _writelog(false),
                            _sound(true),
                            _plugin_sound(true),
                           _extensionsEnabled(false),

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- testsuite/misc-ming.all/Makefile.am 10 Sep 2007 08:21:06 -0000      1.152
+++ testsuite/misc-ming.all/Makefile.am 13 Sep 2007 18:33:20 -0000      1.153
@@ -136,7 +136,6 @@
        eventSoundTest1 \
        eventSoundTest1-Runner \
        DrawingApiTestRunner \
-       get_frame_number_test \
        frame_label_test \
        path_format_test \
         callFunction_test \
@@ -166,6 +165,11 @@
        morph_test1runner \
        $(NULL)
 
+if MING_VERSION_0_4
+check_PROGRAMS += \
+       get_frame_number_test
+endif
+
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
 check_PROGRAMS += KeyTest-Runner \
        intervalTestRunner 
@@ -222,7 +226,6 @@
        displaylist_depths_test9runner \
        displaylist_depths_test10runner \
        displaylist_depths_test11runner \
-       get_frame_number_testrunner \
        frame_label_testrunner \
        path_format_testrunner \
        callFunction_testrunner \
@@ -251,6 +254,12 @@
        FlashVarsTest-Runner
 endif
 
+if MING_VERSION_0_4
+check_SCRIPTS += \
+       get_frame_number_testrunner \
+       $(NULL) 
+endif
+
 if MING_SUPPORTS_INIT_ACTIONS
 check_SCRIPTS += \
        init_action_testrunner \
@@ -1741,6 +1750,11 @@
        registerClassTest2runner \
        $(NULL)
 
+if MING_VERSION_0_4
+TEST_CASES += \
+       get_frame_number_testrunner
+endif
+
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
 TEST_CASES += KeyTest-Runner \
        VarAndCharClashTest-Runner \