[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/i...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/11 18:10:11

Modified files:
        .              : ChangeLog configure.ac 
        doc/C/usermanual/installation: custompath_configuration.xml 
                                       feature_configuration.xml 
        macros         : firefox.m4 

Log message:
                * configure.ac: add a --disable-plugins option to disable
                  both kparts and npapi plugins.
                * macros/firefox.m4: obsolete --with-plugindir, use
                  --with-npapi-plugindir instead (the old one still work
                  for backward compatibility).
                * doc/C/usermanual/installation/: custompath_configuration.xml,
                  feature_configuration.xml: update info about plugin build and
                  install dir options.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5382&r2=1.5383
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.470&r2=1.471
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/custompath_configuration.xml?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/feature_configuration.xml?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5382
retrieving revision 1.5383
diff -u -b -r1.5382 -r1.5383
--- ChangeLog   11 Jan 2008 16:50:35 -0000      1.5382
+++ ChangeLog   11 Jan 2008 18:10:09 -0000      1.5383
@@ -1,3 +1,14 @@
+2008-01-11 Sandro Santilli <address@hidden>
+
+       * configure.ac: add a --disable-plugins option to disable
+         both kparts and npapi plugins.
+       * macros/firefox.m4: obsolete --with-plugindir, use
+         --with-npapi-plugindir instead (the old one still work
+         for backward compatibility).
+       * doc/C/usermanual/installation/: custompath_configuration.xml,
+         feature_configuration.xml: update info about plugin build and
+         install dir options.
+
 2008-01-11 Benjamin Wolsey <address@hidden>
 
        * server/sprite_instance.cpp, server/loadVariablesThread.cpp: Use

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -b -r1.470 -r1.471
--- configure.ac        10 Jan 2008 07:42:40 -0000      1.470
+++ configure.ac        11 Jan 2008 18:10:10 -0000      1.471
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.470 2008/01/10 07:42:40 bwy Exp $
+dnl $Id: configure.ac,v 1.471 2008/01/11 18:10:10 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -881,7 +881,7 @@
 PKG_PROG_PKG_CONFIG
 
 AC_PATH_PROG(PYTHON, python, ,[${pathlist}])
-AM_CONDITIONAL([ENABLE_GNASH_PYTHON_MODULE], FALSE)
+AM_CONDITIONAL([ENABLE_GNASH_PYTHON_MODULE], false)
 
 
 dnl Look for scratchbox
@@ -1011,30 +1011,19 @@
 dnl Enable us to disable building all browser plugins in one command.
 dnl -----------------------------------------------------------------
 
-dnl AC_ARG_ENABLE(plugins,
-dnl   AC_HELP_STRING([--disable-plugins], [Disable all browser plugins from 
building (default=no)]),
-dnl   [case "${enableval}" in
-dnl     yes) plugins=yes ;;
-dnl     no)  plugins=no ;;
-dnl     *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugins option]) 
;;
-dnl   esac],
-dnl   plugins=yes
-dnl )
-dnl if test x$plugins = xno; then
-dnl   nsapi=no
-dnl   kparts=no
-dnl fi
-
-dnl if test x$build_gtk = xyes; then
-dnl   if test x$plugins = xyes; then
-dnl     nsapi=yes
-dnl   fi
-dnl fi
-dnl if test x$build_kde = xyes; then
-dnl   if test x$plugins = xyes; then
-dnl     kparts=yes
-dnl   fi
-dnl fi
+AC_ARG_ENABLE(plugins,
+  AC_HELP_STRING([--disable-plugins], [Disable all browser plugins from 
building (default=no)]),
+  [case "${enableval}" in
+    yes) plugins=yes ;;
+    no)  plugins=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugins option]) ;;
+  esac],
+  plugins=yes
+)
+if test x$plugins = xno; then
+  nsapi=no
+  kparts=no
+fi
 
 GNASH_PATH_FIREFOX
 

Index: doc/C/usermanual/installation/custompath_configuration.xml
===================================================================
RCS file: 
/sources/gnash/gnash/doc/C/usermanual/installation/custompath_configuration.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- doc/C/usermanual/installation/custompath_configuration.xml  4 Jan 2008 
13:35:12 -0000       1.8
+++ doc/C/usermanual/installation/custompath_configuration.xml  11 Jan 2008 
18:10:10 -0000      1.9
@@ -141,7 +141,7 @@
       </entry>
   </row><row>
   <entry>
-    <option>--with-plugindir</option>
+    <option>--with-npapi-plugindir</option>
     </entry>
       <entry>
         This is the directory to install the NPAPI (Mozilla) plugin in.
@@ -153,10 +153,10 @@
     </entry>
       <entry>
         This option sets the default install dir for all KPARTS (kde) files.
-       The plugin will be installed in PREFIX/lib/kde3, use 
-with-kde-plugindir to override.
-       The service file in PREFIX/share/services, use --with-kde-servicesdir 
to override.
-       The config file in PREFIX/share/config, use --with-kde-configdir to 
override.
-       The appdata file in PREFIX/share/apps/klash, use --with-kde-appsdatadir 
to override.
+       The plugin will be installed in PREFIX/lib/kde3, use 
<option>-with-kde-plugindir</option> to override.
+       The service file in PREFIX/share/services, use 
<option>--with-kde-servicesdir</option> to override.
+       The config file in PREFIX/share/config, use 
<option>--with-kde-configdir</option> to override.
+       The appdata file in PREFIX/share/apps/klash, use 
<option>--with-kde-appsdatadir</option> to override.
       </entry>
   </row><row>
   <entry>

Index: doc/C/usermanual/installation/feature_configuration.xml
===================================================================
RCS file: 
/sources/gnash/gnash/doc/C/usermanual/installation/feature_configuration.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- doc/C/usermanual/installation/feature_configuration.xml     30 Dec 2007 
10:44:45 -0000      1.16
+++ doc/C/usermanual/installation/feature_configuration.xml     11 Jan 2008 
18:10:10 -0000      1.17
@@ -145,14 +145,6 @@
         fixed in newer versions (summer 2005) of libMesa.</entry>
 </row>
 <row>
-  <entry><option>--disable-klash</option></entry>
-  <entry>Disable support for Konqueror plugin. If
-        <option>--disable-plugin</option> is not specified
-        and support for building KDE programs is found, Klash is
-        built by default. This option limits the plugin to only
-        the Mozilla/Firefox one.</entry>
-</row>
-<row>
   <entry><option>--enable-libsuffix</option>
 </entry>
   <entry><filename>/lib</filename> directory suffix (64,32,none=default). This 
is only
@@ -186,7 +178,7 @@
   <entry>Force disable/enable building the NPAPI plugin.
          By default the Mozilla plugin is built if the GTK gui 
          is selected.  Specify the 
-         <option>--with-plugindir=</option> option to specify where the
+         <option>--with-npapi-plugindir=</option> option to specify where the
          plugin should be installed.
    </entry>
 </row>
@@ -198,12 +190,19 @@
   <entry>Force disable/enable building the KPARTS plugin. By default the
         KDE plugin is built if the kde gui is selected. 
         Specify the <option>--with-kde-plugindir=</option> and
-        <option>--with-kde-servicesdir=</option> options to specify where the
+        <option>--with-kde-servicesdir=</option> options (or more generally
+        the <option>--with-kde-pluginprefix=</option> one) to specify where the
         plugin should be installed. The default installation dir is extracted
         from kde-config.
   </entry>
 </row>
 <row>
+  <entry>
+     <option>--disable-plugins</option>
+  </entry>
+  <entry>Disable build of both kparts and npapi plugins</entry>
+</row>
+<row>
   <entry>    <option>--enable-qtopia</option>
 </entry>
   <entry>  Link to Qt-embedded, link to the Qtopia

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/firefox.m4   30 Dec 2007 10:44:45 -0000      1.28
+++ macros/firefox.m4   11 Jan 2008 18:10:11 -0000      1.29
@@ -23,20 +23,19 @@
 AC_DEFUN([GNASH_PATH_FIREFOX],
 [dnl 
 
-dnl !!
-dnl !! Moved to configure.ac to allow builds where plugins don't work
-dnl !!
-dnl   AC_ARG_ENABLE(plugin, [  --disable-plugin         Enable support for 
being a plugin],
-dnl   [case "${enableval}" in
-dnl     yes) plugin=yes ;;
-dnl     no)  plugin=no ;;
-dnl     *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) 
;;
-dnl   esac], plugin=yes)
-
   FIREFOX_PLUGINS=""
   if test x"${nsapi}" = x"yes"; then
 
-    AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory 
to install NPAPI plugin in]),
+dnl    AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], 
[Directory to install NPAPI plugin in]),
+dnl      [FIREFOX_PLUGINS=$withval]
+dnl   )
+
+    dnl For backward compatibility, won't be advertised
+    AC_ARG_WITH(plugindir, [],
+       [ AC_MSG_WARN([--with-plugindir is obsoleted, use 
--with-npapi-plugindir instead]); FIREFOX_PLUGINS=$withval])
+
+    AC_ARG_WITH(plugindir,
+       AC_HELP_STRING([--with-npapi-plugindir=DIR], [Directory to install 
NPAPI plugin in]),
       [FIREFOX_PLUGINS=$withval]
     )