[Gnash-commit] gnash ChangeLog Makefile.am configure.ac doc/C/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/19 08:35:07

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        doc/C/refmanual: custompath_configuration.xml 
        macros         : firefox.m4 kde.m4 

Log message:
        * configure.ac: add --with-plugins-install=user|system|prefix,
          default to user.
        * doc/C/refmanual/custompath_configuration.xml: document
        --with-plugins-install.
        * Makefile.am: use --with-plugins-install=prefix on 'make distcheck'
        * macros/firefox.m4: inherit npapi install policy from global plugins
          install policy.
        * macros/kde.m4: inherit kparts install policy from global plugins
          install policy.
        
        To recap: this commit finished the cleanup to make plugins install 
policy
        speicifcation easier. In the most common cases you'll only need a single
        configure switch:
        
                --with-plugins-install=system|user|prefix
        
        The current default is 'user'.
        The 'distcheck' rule will use 'prefix'. 
        People willing to install system-wide would use 'system'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6641&r2=1.6642
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.532&r2=1.533
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/refmanual/custompath_configuration.xml?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6641
retrieving revision 1.6642
diff -u -b -r1.6641 -r1.6642
--- ChangeLog   19 May 2008 08:18:14 -0000      1.6641
+++ ChangeLog   19 May 2008 08:35:06 -0000      1.6642
@@ -1,5 +1,17 @@
 2008-05-19 Sandro Santilli <address@hidden>
 
+       * configure.ac: add --with-plugins-install=user|system|prefix,
+         default to user.
+       * doc/C/refmanual/custompath_configuration.xml: document
+       --with-plugins-install.
+       * Makefile.am: use --with-plugins-install=prefix on 'make distcheck'
+       * macros/firefox.m4: inherit npapi install policy from global plugins
+         install policy.
+       * macros/kde.m4: inherit kparts install policy from global plugins 
+         install policy.
+
+2008-05-19 Sandro Santilli <address@hidden>
+
        * macros/firefox.m4: add --with-npapi-install=user|system|prefix,
          default to user.
        * doc/C/refmanual/custompath_configuration.xml: document

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- Makefile.am 18 May 2008 19:40:13 -0000      1.113
+++ Makefile.am 19 May 2008 08:35:07 -0000      1.114
@@ -35,8 +35,7 @@
 ## We also want to build everything possible, since we're
 ## testing builds.
 DISTCHECK_CONFIGURE_FLAGS = \
-       --with-kparts-install=prefix \
-       --with-npapi-plugindir=/tmp/gnash-distcheck-$$/npapi \
+       --with-plugins-install=prefix \
        --enable-extensions=all \
        --enable-gui=all 
 #--enable-cygnal

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -b -r1.532 -r1.533
--- configure.ac        18 May 2008 19:01:23 -0000      1.532
+++ configure.ac        19 May 2008 08:35:07 -0000      1.533
@@ -1244,6 +1244,20 @@
   kparts=no
 fi
 
+dnl
+dnl Set the general plugins install policy here
+dnl
+AC_ARG_WITH(plugins-install,
+  AC_HELP_STRING([--with-plugins-install=system|user|prefix], [Policy for 
plugins install. Default: user.]),
+       [case "${withval}" in
+         user) PLUGINS_INSTALL_POLICY=user ;;
+         system) PLUGINS_INSTALL_POLICY=system ;;
+         prefix) PLUGINS_INSTALL_POLICY=prefix ;;
+         *)  AC_MSG_ERROR([bad value ${withval} for --with-plugins-install]) ;;
+        esac 
+       ], PLUGINS_INSTALL_POLICY=user) 
+
+
 GNASH_PATH_FIREFOX
 
 dnl -----------------------------------------------------------------

Index: doc/C/refmanual/custompath_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/refmanual/custompath_configuration.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/C/refmanual/custompath_configuration.xml        19 May 2008 08:18:15 
-0000      1.5
+++ doc/C/refmanual/custompath_configuration.xml        19 May 2008 08:35:07 
-0000      1.6
@@ -157,6 +157,19 @@
        </row>
        <row>
          <entry>
+           <option>--with-plugins-install=user|system|prefix</option>
+         </entry>
+         <entry>
+           This option sets the install policy for NPAPI (mozilla) and KPARTS 
(kde) plugins.
+           Policy 'user' means plugin will be installed only for the 
configuring user.
+            Policy 'system' will try to find a systemwide place for plugins 
(to enable for all).
+            Policy 'prefix' will install under ${prefix} (npapi/kparts 
subdirs);
+            WARNING: if 'prefix' policy is given, plugins won't be found w/out 
further enabling procudures.
+            The default policy is 'user', can be overridden for specific 
plugins.
+         </entry>
+       </row>
+       <row>
+         <entry>
            <option>--with-npapi-install=user|system|prefix</option>
          </entry>
          <entry>

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- macros/firefox.m4   19 May 2008 08:18:17 -0000      1.31
+++ macros/firefox.m4   19 May 2008 08:35:07 -0000      1.32
@@ -34,7 +34,7 @@
          prefix) NPAPI_INSTALL_POLICY=prefix ;;
          *)  AC_MSG_ERROR([bad value ${withval} for --with-npapi-install]) ;;
         esac 
-      ], NPAPI_INSTALL_POLICY=user) dnl TODO: inherit a generic 
PLUGINS_INSTALL_POLICY when available
+      ], NPAPI_INSTALL_POLICY=${PLUGINS_INSTALL_POLICY}) dnl Inherit a generic 
PLUGINS_INSTALL_POLICY when available
 
 
   dnl For backward compatibility, won't be advertised

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- macros/kde.m4       18 May 2008 19:40:13 -0000      1.44
+++ macros/kde.m4       19 May 2008 08:35:07 -0000      1.45
@@ -39,7 +39,7 @@
          prefix) KPARTS_INSTALL_POLICY=prefix ;;
          *)  AC_MSG_ERROR([bad value ${withval} for --with-kparts-install]) ;;
         esac 
-       ], KPARTS_INSTALL_POLICY=user) dnl TODO: inherit a generic 
PLUGINS_INSTALL_POLICY when available
+       ], KPARTS_INSTALL_POLICY=${PLUGINS_INSTALL_POLICY}) dnl Inherit a 
generic PLUGINS_INSTALL_POLICY when available
 
   AC_ARG_WITH(kde-pluginprefix, AC_HELP_STRING([--with-kde-pluginprefix=DIR],
       [Prefix for KDE plugin, like /usr]),