Bug 541203 - Port |Bug 216462 - (smil) Implement SVG (SMIL) Animation| to comm-central, configure part; (Av3) Restore/complete MOZ_SMIL variable handling.
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 19 Feb 2010 18:02:30 +0100
changeset 4964 4c64fa59e01c153e1bafca0f1c3da7f1b5a950b4
parent 4963 8b558e5b1cb0564a455f8fba2e343f81df719b21
child 4965 910c696262b37f541bdd8b7feecf546b6386f214
push idunknown
push userunknown
push dateunknown
bugs541203, 216462
Bug 541203 - Port |Bug 216462 - (smil) Implement SVG (SMIL) Animation| to comm-central, configure part; (Av3) Restore/complete MOZ_SMIL variable handling. r=(kairo, standard8)
config/autoconf.mk.in
configure.in
mail/installer/package-manifest.in
suite/installer/package-manifest.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -201,16 +201,17 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
 
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
 MOZ_NATIVE_BZ2	= @SYSTEM_BZ2@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@
 
 MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
 MOZ_PERMISSIONS = @MOZ_PERMISSIONS@
+MOZ_SMIL = @MOZ_SMIL@
 
 MOZ_PREF_EXTENSIONS = @MOZ_PREF_EXTENSIONS@
 
 MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@
 
 MOZ_ENABLE_STARTUP_NOTIFICATION = @MOZ_ENABLE_STARTUP_NOTIFICATION@
 MOZ_STARTUP_NOTIFICATION_CFLAGS = @MOZ_STARTUP_NOTIFICATION_CFLAGS@
 MOZ_STARTUP_NOTIFICATION_LIBS = @MOZ_STARTUP_NOTIFICATION_LIBS@
--- a/configure.in
+++ b/configure.in
@@ -5317,16 +5317,39 @@ else
 
 MOZ_ARG_DISABLE_BOOL(svg,
 [  --disable-svg            Disable SVG support (NB: unsupported option in comm-central)],
     AC_MSG_ERROR([comm-central does not support disabling SVG.]))
 
 fi
 
 dnl ========================================================
+dnl SMIL
+dnl ========================================================
+if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
+
+MOZ_ARG_ENABLE_BOOL(smil,
+[  --enable-smil           Enable SMIL animation support],
+    MOZ_SMIL=1,
+    MOZ_SMIL= )
+
+else
+
+MOZ_SMIL=1
+MOZ_ARG_DISABLE_BOOL(smil,
+[  --disable-smil           Disable SMIL animation support],
+    MOZ_SMIL=,
+    MOZ_SMIL=1 )
+
+fi
+if test -n "$MOZ_SMIL"; then
+  AC_DEFINE(MOZ_SMIL)
+fi
+
+dnl ========================================================
 dnl Build Freetype in the tree
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(tree-freetype,
 [  --enable-tree-freetype         Enable Tree FreeType],
     MOZ_TREE_FREETYPE=1,
     MOZ_TREE_FREETYPE= )
 if test -n "$MOZ_TREE_FREETYPE"; then
    CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
@@ -6861,16 +6884,17 @@ AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MINIMO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_PERMISSIONS)
 AC_SUBST(MOZ_XTF)
 AC_SUBST(MOZ_NO_INSPECTOR_APIS)
 AC_SUBST(MOZ_PREF_EXTENSIONS)
+AC_SUBST(MOZ_SMIL)
 AC_SUBST(MOZ_XSLT_STANDALONE)
 AC_SUBST(MOZ_JS_LIBS)
 AC_SUBST(MOZ_PSM)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_MODULES)
 AC_SUBST(MOZ_PROFILE_MODULES)
 AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -420,17 +420,17 @@
 @BINPATH@/components/dom_css.xpt
 @BINPATH@/components/dom_events.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_html.xpt
 @BINPATH@/components/dom_json.xpt
 @BINPATH@/components/dom_offline.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_sidebar.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
+#ifdef MOZ_SMIL
 @BINPATH@/components/dom_smil.xpt
 #endif
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_threads.xpt
 @BINPATH@/components/dom_traversal.xpt
 @BINPATH@/components/dom_views.xpt
 @BINPATH@/components/dom_xbl.xpt
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -313,17 +313,19 @@
 @BINPATH@/components/dom_events.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_html.xpt
 @BINPATH@/components/dom_json.xpt
 @BINPATH@/components/dom_loadsave.xpt
 @BINPATH@/components/dom_offline.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_sidebar.xpt
+#ifdef MOZ_SMIL
 @BINPATH@/components/dom_smil.xpt
+#endif
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_svg.xpt
 @BINPATH@/components/dom_threads.xpt
 @BINPATH@/components/dom_traversal.xpt
 @BINPATH@/components/dom_views.xpt
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt