[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am doc/C/refmanual/cus...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am doc/C/refmanual/cus... |
|
Date: |
Sun, 18 May 2008 19:40:14 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/05/18 19:40:14
Modified files:
. : ChangeLog Makefile.am
doc/C/refmanual: custompath_configuration.xml
macros : kde.m4
Log message:
* macros/kde.m4: add --with-kparts-install=user|system|prefix,
default to prefix, overridable with --with-kde-pluginprefix
and further overridable by specific kparts components
switches.
* Makefile.am: use --with-kparts-install=prefix on 'distcheck'.
* doc/C/refmanual/custompath_configuration.xml: document
--with-kparts-install.
Examples:
$ ./configure --with-kparts-install=user | grep KPARTS
KPARTS plugin enabled (default). Use --disable-kparts to disable
KPARTS plugin will be installed in /home/strk/.kde/lib/kde3
KPARTS service will be installed in
/home/strk/.kde/share/services
KPARTS config dir will be in /home/strk/.kde/share/config
KPARTS appsdata will be installed in
/home/strk/.kde/share/apps/klash
$ ./configure --with-kparts-install=system | grep KPARTS
KPARTS plugin enabled (default). Use --disable-kparts to disable
KPARTS plugin will be installed in /usr/lib/kde3
KPARTS service will be installed in /usr/share/services
KPARTS config dir will be in /usr/share/config
KPARTS appsdata will be installed in /usr/share/apps/klash
$ ./configure --with-kparts-install=prefix | grep KPARTS
KPARTS plugin enabled (default). Use --disable-kparts to disable
KPARTS plugin will be installed in ${prefix}/kparts/lib/kde3
KPARTS service will be installed in
${prefix}/kparts/share/services
KPARTS config dir will be in ${prefix}/kparts/share/config
KPARTS appsdata will be installed in
${prefix}/kparts/share/apps/klash
$ ./configure | grep KPARTS
KPARTS plugin enabled (default). Use --disable-kparts to disable
KPARTS plugin will be installed in /home/strk/.kde/lib/kde3
KPARTS service will be installed in
/home/strk/.kde/share/services
KPARTS config dir will be in /home/strk/.kde/share/config
KPARTS appsdata will be installed in
/home/strk/.kde/share/apps/klash
For NPAPI won't be as simple (how to tell what's the proper systemwide
install dir for them ?), but the plan is once someone finds out we'd
have --with-npapi-install=user|system|prefix and finally a generic
--with-plugin-install=user|system|prefix setting the install policy
for both.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6637&r2=1.6638
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/refmanual/custompath_configuration.xml?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.43&r2=1.44
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6637
retrieving revision 1.6638
diff -u -b -r1.6637 -r1.6638
--- ChangeLog 18 May 2008 19:01:22 -0000 1.6637
+++ ChangeLog 18 May 2008 19:40:12 -0000 1.6638
@@ -1,5 +1,15 @@
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
+ and further overridable by specific kparts components
+ switches.
+ * Makefile.am: use --with-kparts-install=prefix on 'distcheck'.
+ * doc/C/refmanual/custompath_configuration.xml: document
+ --with-kparts-install.
+
+2008-05-18 Sandro Santilli <address@hidden>
+
* configure.ac: have KPARTS install dir summary use 'KPARTS' label,
to conform with that given by 'make dumpconfig'.
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- Makefile.am 16 May 2008 07:40:17 -0000 1.112
+++ Makefile.am 18 May 2008 19:40:13 -0000 1.113
@@ -35,7 +35,7 @@
## We also want to build everything possible, since we're
## testing builds.
DISTCHECK_CONFIGURE_FLAGS = \
- --with-kde-pluginprefix=/tmp/gnash-distcheck-$$/kparts \
+ --with-kparts-install=prefix \
--with-npapi-plugindir=/tmp/gnash-distcheck-$$/npapi \
--enable-extensions=all \
--enable-gui=all
Index: doc/C/refmanual/custompath_configuration.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/refmanual/custompath_configuration.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/C/refmanual/custompath_configuration.xml 2 Mar 2008 16:28:29
-0000 1.3
+++ doc/C/refmanual/custompath_configuration.xml 18 May 2008 19:40:13
-0000 1.4
@@ -166,6 +166,21 @@
</row>
<row>
<entry>
+ <option>--with-kparts-install=user|system|prefix</option>
+ </entry>
+ <entry>
+ This option sets the install policy for all KPARTS (kde) files.
+ Policy 'user' means plugin will be installed in ~/.kde;
+ 'system' will find out using kde-config (or bail out if not found);
+ 'prefix' will install under ${prefix}/kparts.
+ The actual prefix can be overridden using
+ <option>--with-kde-pluginprefix</option>
+ or the fine-tuned options.
+ The default at time of writing (2008-05-18) is 'user'.
+ </entry>
+ </row>
+ <row>
+ <entry>
<option>--with-kde-pluginprefix</option>
</entry>
<entry>
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- macros/kde.m4 14 Mar 2008 23:50:02 -0000 1.43
+++ macros/kde.m4 18 May 2008 19:40:13 -0000 1.44
@@ -29,26 +29,17 @@
fi
])
+ AC_PATH_PROG(KDE_CONFIG, kde-config, ,[${pathlist}])
- AC_ARG_WITH(kde-plugindir,
- AC_HELP_STRING([--with-kde-plugindir=DIR], [Directory to install KDE
plugin in]),
- [KDE_PLUGINDIR=${withval}
- ])
-
- AC_ARG_WITH(kde-servicesdir, AC_HELP_STRING([--with-kde-servicesdir=DIR],
- [Directory to install KDE service in]),
- [KDE_SERVICESDIR=${withval}
- ])
-
- AC_ARG_WITH(kde-configdir, AC_HELP_STRING([--with-kde-configdir=DIR],
- [Directory to install KDE configfile in]),
- [KDE_CONFIGDIR=${withval}
- ])
-
- AC_ARG_WITH(kde-appsdatadir, AC_HELP_STRING([--with-kde-appsdatadir=DIR],
- [Directory to install KDE data in]),
- [KDE_APPSDATADIR=${withval}
- ])
+ AC_ARG_WITH(kparts-install,
+ AC_HELP_STRING([--with-kparts-install=system|user|prefix], [Policy for
KPARTS plugin install. Default: user.]),
+ [case "${withval}" in
+ user) KPARTS_INSTALL_POLICY=user ;;
+ system) KPARTS_INSTALL_POLICY=system ;;
+ 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
AC_ARG_WITH(kde-pluginprefix, AC_HELP_STRING([--with-kde-pluginprefix=DIR],
[Prefix for KDE plugin, like /usr]),
@@ -58,7 +49,6 @@
kde_prefix="/usr"
has_kde=no
if test x"${ac_cv_path_kde_incl}" = x; then
- AC_PATH_PROG(KDE_CONFIG, kde-config, ,[${pathlist}])
if test "x$KDE_CONFIG" != "x" ; then
if test "x$KDE_CFLAGS" = "x" ; then
kde_prefix=`$KDE_CONFIG --prefix`
@@ -178,13 +168,44 @@
dnl If building the kparts plugin, get the install paths correct.
if test x$kparts = xyes; then
if test x$KDE_PLUGINPREFIX = x; then
+ if test "x$KPARTS_INSTALL_POLICY" = "xuser"; then
KDE_PLUGINPREFIX=${HOME}/.kde
+ elif test "x$KPARTS_INSTALL_POLICY" = "xsystem"; then
+ if test "x$KDE_CONFIG" != "x" ; then
+ KDE_PLUGINPREFIX=`$KDE_CONFIG --prefix`
+ else
+ AC_MSG_ERROR([Dunno how to make a 'system' kde plugin install not
having found kde-config]);
fi
- KDE_PLUGINDIR=$KDE_PLUGINPREFIX'/lib/kde3'
- KDE_SERVICESDIR=$KDE_PLUGINPREFIX'/share/services'
- KDE_CONFIGDIR=$KDE_PLUGINPREFIX'/share/config'
- KDE_APPSDATADIR=$KDE_PLUGINPREFIX'/share/apps/klash'
+ elif test "x$KPARTS_INSTALL_POLICY" = "xprefix"; then
+ KDE_PLUGINPREFIX="\${prefix}/kparts"
fi
+ fi
+ KDE_PLUGINDIR="${KDE_PLUGINPREFIX}/lib/kde3"
+ KDE_SERVICESDIR="${KDE_PLUGINPREFIX}/share/services"
+ KDE_CONFIGDIR="${KDE_PLUGINPREFIX}/share/config"
+ KDE_APPSDATADIR="${KDE_PLUGINPREFIX}/share/apps/klash"
+ fi
+
+ AC_ARG_WITH(kde-plugindir,
+ AC_HELP_STRING([--with-kde-plugindir=DIR], [Directory to install KDE
plugin in]),
+ [KDE_PLUGINDIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-servicesdir, AC_HELP_STRING([--with-kde-servicesdir=DIR],
+ [Directory to install KDE service in]),
+ [KDE_SERVICESDIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-configdir, AC_HELP_STRING([--with-kde-configdir=DIR],
+ [Directory to install KDE configfile in]),
+ [KDE_CONFIGDIR=${withval}
+ ])
+
+ AC_ARG_WITH(kde-appsdatadir, AC_HELP_STRING([--with-kde-appsdatadir=DIR],
+ [Directory to install KDE data in]),
+ [KDE_APPSDATADIR=${withval}
+ ])
+
AC_SUBST(KDE_PLUGINDIR)
AC_SUBST(KDE_SERVICESDIR)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am doc/C/refmanual/cus...,
Sandro Santilli <=