[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog doc/C/refmanual/custompath_conf...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog doc/C/refmanual/custompath_conf... |
Date: |
Mon, 19 May 2008 08:18:19 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/05/19 08:18:18
Modified files:
. : ChangeLog
doc/C/refmanual: custompath_configuration.xml
macros : firefox.m4
Log message:
* macros/firefox.m4: add --with-npapi-install=user|system|prefix,
default to user.
* doc/C/refmanual/custompath_configuration.xml: document
--with-npapi-install.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6640&r2=1.6641
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/refmanual/custompath_configuration.xml?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.30&r2=1.31
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6640
retrieving revision 1.6641
diff -u -b -r1.6640 -r1.6641
--- ChangeLog 19 May 2008 07:15:47 -0000 1.6640
+++ ChangeLog 19 May 2008 08:18:14 -0000 1.6641
@@ -1,3 +1,10 @@
+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
+ --with-npapi-install.
+
2008-05-18 Zou Lunkai <address@hidden>
* server/cxform.cpp, server/swf/StartSoundTag.cpp: more read_bit()
reduction.
@@ -21,7 +28,7 @@
2008-05-18 Sandro Santilli <address@hidden>
* macros/kde.m4: add --with-kparts-install=user|system|prefix,
- default to prefix, overridable with --with-kde-pluginprefix
+ default to user, overridable with --with-kde-pluginprefix
and further overridable by specific kparts components
switches.
* Makefile.am: use --with-kparts-install=prefix on 'distcheck'.
Index: doc/C/refmanual/custompath_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/refmanual/custompath_configuration.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/C/refmanual/custompath_configuration.xml 18 May 2008 19:40:13
-0000 1.4
+++ doc/C/refmanual/custompath_configuration.xml 19 May 2008 08:18:15
-0000 1.5
@@ -157,6 +157,17 @@
</row>
<row>
<entry>
+ <option>--with-npapi-install=user|system|prefix</option>
+ </entry>
+ <entry>
+ This option sets the install policy for NPAPI plugin.
+ Policy 'user' means plugin will be installed in ~/.mozilla/plugins;
+ 'system' will try to find an existing system-wide mozilla plugin
dir (or bail out if not found);
+ 'prefix' will install under ${prefix}/npapi.
+ </entry>
+ </row>
+ <row>
+ <entry>
<option>--with-npapi-plugindir</option>
</entry>
<entry>
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/firefox.m4 17 Jan 2008 08:21:07 -0000 1.30
+++ macros/firefox.m4 19 May 2008 08:18:17 -0000 1.31
@@ -26,9 +26,16 @@
FIREFOX_PLUGINS=""
if test x"${nsapi}" = x"yes"; then
-dnl AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR],
[Directory to install NPAPI plugin in]),
-dnl [FIREFOX_PLUGINS=$withval]
-dnl )
+ AC_ARG_WITH(npapi-install,
+ AC_HELP_STRING([--with-npapi-install=system|user|prefix], [Policy for
NPAPI plugin install. Default: user.]),
+ [case "${withval}" in
+ user) NPAPI_INSTALL_POLICY=user ;;
+ system) NPAPI_INSTALL_POLICY=system ;;
+ 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
+
dnl For backward compatibility, won't be advertised
AC_ARG_WITH(plugindir, [],
@@ -39,27 +46,33 @@
[FIREFOX_PLUGINS=$withval]
)
-dnl GNASHEXE=""
-dnl dnl Allow setting a path for the Gnash executable to be different from
the prefix. This
-dnl dnl is mostly only used for cross compiling.
-dnl AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory
to where the gnash executable is]),
-dnl [gnashbindir=$withval]
-dnl )
-dnl
-dnl dnl default to the prefix if no path is specified. As $prefix isn't
set at this time by
-dnl dnl configure, we set this to the variable itself so it gets resolved
at make time.
-dnl if test x"${gnashbindir}" = "x" ; then
-dnl GNASHEXE="\${prefix}/bin"
-dnl else
-dnl GNASHEXE=${gnashbindir}
-dnl fi
-dnl AC_SUBST(GNASHEXE)
+ dnl
+ dnl If not explicitly specified, figure install dir
+ dnl from policy
+ dnl
+ if test x"${FIREFOX_PLUGINS}" = "x" ; then
+
+ if test "x${NPAPI_INSTALL_POLICY}" = "xuser"; then
- dnl Always install the plugin in the users home directory. We
- dnl always use .mozilla instead of .firefox, as this directoryis
+ dnl We always use .mozilla instead of .firefox, as this directoryis
dnl used by all mozilla derived browsers.
- if test x"${FIREFOX_PLUGINS}" = "x" ; then
FIREFOX_PLUGINS=$HOME/.mozilla/plugins
+
+ elif test "x${NPAPI_INSTALL_POLICY}" = "xsystem"; then
+
+ for dir in /usr/lib/mozilla/plugins /usr/lib/firefox/plugins; do
+ if test -d $dir; then
+ FIREFOX_PLUGINS=$dir
+ break
+ fi
+ done
+ if test "x${FIREFOX_PLUGINS}" = x; then
+ AC_MSG_ERROR([Could not find system mozilla plugin dir, use
--with-npapi-plugindir.]);
+ fi
+
+ elif test "x${NPAPI_INSTALL_POLICY}" = "xprefix"; then
+ FIREFOX_PLUGINS="\${prefix}/npapi"
+ fi
fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog doc/C/refmanual/custompath_conf...,
Sandro Santilli <=