[Gnash-commit] gnash configure.ac ChangeLog packaging/debian/r... [release_0_7_2]

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Rob Savoye <rsavoye>    06/10/31 19:45:01

Modified files:
        .              : configure.ac ChangeLog 
        packaging/debian: rules 
        packaging/redhat: gnash.spec 

Log message:
                * packaging/debian/rules: Remove --enable-plugin.
                * packaging/redhat/gnash.spec: Remove --enable-plugin.
                * configure.ac: Enable the plugin by default. Change
                --enable-plugin to --disable-plugin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.186.2.6&r2=1.186.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.33&r2=1.1412.2.34
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/debian/rules?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.2&r2=1.11.2.3

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.186.2.6
retrieving revision 1.186.2.7
diff -u -b -r1.186.2.6 -r1.186.2.7
--- configure.ac        31 Oct 2006 16:35:05 -0000      1.186.2.6
+++ configure.ac        31 Oct 2006 19:45:01 -0000      1.186.2.7
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.186.2.6 2006/10/31 16:35:05 rsavoye Exp $
+dnl $Id: configure.ac,v 1.186.2.7 2006/10/31 19:45:01 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.2)
@@ -323,13 +323,13 @@
 dnl !! a specialized macros/plugin.m4
 dnl
 AC_ARG_ENABLE(plugin,
-  AC_HELP_STRING([--enable-plugin], [Enable plugins build]),
+  AC_HELP_STRING([--disable-plugin], [Disable plugins build]),
   [case "${enableval}" in
-    yes) plugin=yes ;;
-    no)  plugin=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for enable-plugin option]) ;;
+    yes) plugin=no ;;
+    no)  plugin=yes ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
   esac],
-  plugin=no
+  plugin=yes
 )
 AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.33
retrieving revision 1.1412.2.34
diff -u -b -r1.1412.2.33 -r1.1412.2.34
--- ChangeLog   31 Oct 2006 17:38:47 -0000      1.1412.2.33
+++ ChangeLog   31 Oct 2006 19:45:01 -0000      1.1412.2.34
@@ -1,11 +1,15 @@
 2006-10-31  Rob Savoye  <address@hidden>
 
+       * packaging/debian/rules: Remove --enable-plugin.
+       * packaging/redhat/gnash.spec: Remove --enable-plugin.
+       * configure.ac: Enable the plugin by default. Change
+       --enable-plugin to --disable-plugin.
+       
        * libbase/network.cpp, network.h: Remove enabled testing code from
        base class. 
        * server/asobj/NetConnection.cpp, NetConnection.h: Add enabled
        testing code to where it really belongs.
 
-
        * gui/Makefile.am: Only build klash if using KDE.
        * plugin/klash/Makefile.am: Build klash here again.
        * configure.ac: Don't turn KDE on when building klash. Remove

Index: packaging/debian/rules
===================================================================
RCS file: /sources/gnash/gnash/packaging/debian/rules,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- packaging/debian/rules      30 Oct 2006 14:28:47 -0000      1.2.2.1
+++ packaging/debian/rules      31 Oct 2006 19:45:01 -0000      1.2.2.2
@@ -45,7 +45,7 @@
                --infodir=\$${prefix}/share/info \
                --enable-sdk-install \
                --with-plugindir=\$${prefix}/lib/mozilla/plugins \
-               --disable-static --enable-plugin
+               --disable-static
 
 # BUILD
 

Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- packaging/redhat/gnash.spec 30 Oct 2006 14:28:47 -0000      1.11.2.2
+++ packaging/redhat/gnash.spec 31 Oct 2006 19:45:01 -0000      1.11.2.3
@@ -60,7 +60,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-plugin \
+  --enable-ghelp --enable-docbook \
   --disable-dependency-tracking --disable-rpath \
   --with-qtdir=$QTDIR
 make %{?_smp_mflags}