[Gnash-commit] /srv/bzr/gnash/avm2 r9744: add enable-avm2 option back in, enabled by default in this branch.

[rob]

------------------------------------------------------------
revno: 9744
committer: address@hidden
branch nick: avm2
timestamp: Sun 2009-05-17 10:15:25 -0600
message:
  add enable-avm2 option back in, enabled by default in this branch.
modified:
  configure.ac
  libcore/Makefile.am
  libcore/parser/Makefile.am
  libcore/vm/Makefile.am
  testsuite/libcore.all/Makefile.am

=== modified file 'configure.ac'
--- a/configure.ac      2009-05-16 18:30:02 +0000
+++ b/configure.ac      2009-05-17 16:15:25 +0000
@@ -216,6 +216,20 @@
 
 dnl always enable avm2 in this branch
 AC_DEFINE(ENABLE_AVM2, [1], [Enable AVM2 code])
+AC_ARG_ENABLE(avm2,
+  AC_HELP_STRING([--enable-avm2], [Enable support for AS3]),
+  [case "${enableval}" in
+    yes) avm2=yes ;;
+    no)  avm2=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for enable-avm2 option]) ;;
+  esac], avm2=yes
+)
+AM_CONDITIONAL(ENABLE_AVM2, [test x"$avm2" = xyes])
+if test x$avm2 = xyes; then
+    AC_DEFINE(ENABLE_AVM2, [1], [Enable AVM2 code])
+fi
+AC_DEFINE(ENABLE_AVM2, [1], [Enable AVM2 code])
+
 
 dnl This option is only used if you want Gnash to interwork with 
 dnl the Adobe player using the LocalConnection class.

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2009-05-16 18:30:02 +0000
+++ b/libcore/Makefile.am       2009-05-17 16:15:25 +0000
@@ -126,10 +126,12 @@
        $(FREETYPE_SOURCES) \
        $(NULL)
 
+if ENABLE_AVM2
 libgnashcore_la_SOURCES += \
        abc_function.cpp \
        asMethod.cpp
        $(NULL)
+endif
 
 noinst_HEADERS = \
        URLAccessManager.h \
@@ -192,6 +194,7 @@
        Video.h \
        $(NULL)
 
+if ENABLE_AVM2
 noinst_HEADERS += \
        swf/DoABCTag.h \
        abc_function.h \
@@ -199,6 +202,7 @@
        asException.h \
        asBoundValues.h \
        $(NULL)
+endif
 
 EXTENSIONS_API = \
        as_object.h \

=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am        2009-05-16 18:30:02 +0000
+++ b/libcore/parser/Makefile.am        2009-05-17 16:15:25 +0000
@@ -50,9 +50,10 @@
        sound_definition.cpp \
        sprite_definition.cpp
 
+if ENABLE_AVM2
 libgnashparser_la_SOURCES += \
        abc_block.cpp
-
+endif
 noinst_HEADERS = \
        action_buffer.h \
        BitmapMovieDefinition.h \
@@ -61,8 +62,10 @@
        sound_definition.h \
        sprite_definition.h
 
+if ENABLE_AVM2
 noinst_HEADERS += \
        abc_block.h
+endif
 
 EXTENSIONS_API = \
        movie_definition.h \

=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am    2009-05-16 18:30:02 +0000
+++ b/libcore/vm/Makefile.am    2009-05-17 16:15:25 +0000
@@ -41,39 +41,43 @@
 libgnashvm_la_SOURCES = \
        ASHandlers.cpp \
        ActionExec.cpp \
-       VM.cpp          \
+       VM.cpp \
        action.cpp \
        CallStack.cpp \
        $(NULL)
 
+if ENABLE_AVM2
 libgnashvm_la_SOURCES += \
        CodeStream.cpp \
        Machine.cpp
        $(NULL)
+endif
 
-noinst_HEADERS =               \
-       ASHandlers.h            \
-       CodeStream.h            \
-       asName.h                        \
-       ActionExec.h            \
-       ExecutableCode.h        \
-       action.h                \
-       with_stack_entry.h      \
+noinst_HEADERS = \
+       ASHandlers.h \
+       CodeStream.h \
+       asName.h \
+       ActionExec.h \
+       ExecutableCode.h \
+       action.h \
+       with_stack_entry.h \
        $(NULL)
 
 EXTENSIONS_API = \
-       fn_call.h               \
+       fn_call.h \
        CallStack.h \
-       SafeStack.h                     \
-       VM.h                    \
-       Machine.h                       \
+       SafeStack.h \
+       VM.h \
+       Machine.h \
        $(NULL)
-       
+
+if ENABLE_AVM2
 noinst_HEADERS += \
-       asName.h                        \
-       CodeStream.h            \
+       asName.h \
+       CodeStream.h \
        Machine.h \
        $(NULL)
+endif
 
 if SDKINSTALL
 noinst_HEADERS += $(EXTENSIONS_API)

=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2009-05-16 18:30:02 +0000
+++ b/testsuite/libcore.all/Makefile.am 2009-05-17 16:15:25 +0000
@@ -47,8 +47,10 @@
        SafeStackTest \
        $(NULL)
 
+if ENABLE_AVM2
 check_PROGRAMS += \
        CodeStreamTest
+endif
 
 CLEANFILES = \
        testrun.sum \