[totem] browser-plugin: Build vegas plugin by default

[Bastien Nocera <hadess src gnome org>]

commit eeb1a65ecdbb554c451c705ec7a090a00bd96f06
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 6 11:08:35 2011 +0000

    browser-plugin: Build vegas plugin by default
    
    But disable its use through the browser-plugins.ini file instead.

 browser-plugin/Makefile.am         |    4 ++++
 browser-plugin/browser-plugins.ini |    5 +++++
 configure.in                       |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index dbaa3a4..dd560b7 100644
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -61,6 +61,10 @@ marshal.c: marshal.list marshal.h
 CLEANFILES = $(MARSHAL_FILES)
 EXTRA_DIST += marshal.list
 
+config_DATA = browser-plugins.ini
+configdir = $(sysconfdir)/totem
+EXTRA_DIST += $(config_files)
+
 # The Glow button test program
 noinst_PROGRAMS = test-glow-button
 
diff --git a/browser-plugin/browser-plugins.ini b/browser-plugin/browser-plugins.ini
new file mode 100644
index 0000000..0a4aebb
--- /dev/null
+++ b/browser-plugin/browser-plugins.ini
@@ -0,0 +1,5 @@
+# See provided README.browser-plugin file
+# for details about the syntax
+
+[Plugins]
+application/x-shockwave-flash.disabled=true
diff --git a/configure.in b/configure.in
index dc4acbf..d0a96ca 100644
--- a/configure.in
+++ b/configure.in
@@ -624,7 +624,7 @@ AC_MSG_RESULT([$enable_cone_plugin])
 AC_MSG_CHECKING([whether to enable the Vegas browser plugin])
 AC_ARG_ENABLE([vegas-plugin],
 	AS_HELP_STRING([--enable-vegas-plugin],[Whether to enable the Vegas browser plugin]),
-	[enable_vegas_plugin=yes],[enable_vegas_plugin=no])
+	[],[enable_vegas_plugin=yes])
 AC_MSG_RESULT([$enable_vegas_plugin])
 
 fi