On Mon, Mar 03, 2008 at 08:48:47AM +0100, strk wrote:
>
> Can you see a cleaner solution ? Some automatic way to enable
> plugin locations or similar ?
In fact, since there is additionnally --with-kde-plugindir, it is right.
However I think that it is wrong to use the absolute paths in the default
case. I propose the attached patch to use the absolute paths only if
--with-kde-system-paths is set. Does it seems right?
--
Pat
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.491
diff -u -3 -p -r1.491 configure.ac
--- configure.ac 3 Mar 2008 02:54:21 -0000 1.491
+++ configure.ac 3 Mar 2008 12:34:24 -0000
@@ -1403,6 +1403,16 @@ if test x$kparts = xyes; then
[KDE_PLUGINPREFIX=${withval}]
)
+ AC_ARG_WITH([kde-system-paths],
+ [AC_HELP_STRING([--with-kde-system-paths=yes],
+ [Use absolute KDE paths (default is no)])],
+ [case "${withval}" in
+ yes) gnash_kde_system_paths=yes ;;
+ no) gnash_kde_system_paths=no ;;
+ *) AC_MSG_ERROR([bad value ${withval} for kde-system-paths option]) ;;
+ esac], [gnash_kde_system_paths=no]
+ )
+
if test $KDE_PLUGINPREFIX; then
KDE_PLUGINDIR=$KDE_PLUGINPREFIX'/lib/kde3'
KDE_SERVICESDIR=$KDE_PLUGINPREFIX'/share/services'
@@ -1410,15 +1420,22 @@ if test x$kparts = xyes; then
KDE_APPSDATADIR=$KDE_PLUGINPREFIX'/share/apps/klash'
else
if test x${KDE_CONFIG} != x; then
- KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
- KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
- KDE_CONFIGDIR=`${KDE_CONFIG} --install config --expandvars`
- KDE_APPSDATADIR=`${KDE_CONFIG} --install data --expandvars`'/klash'
+ if test x"$gnash_kde_system_paths" = 'xyes'; then
+ KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
+ KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
+ KDE_CONFIGDIR=`${KDE_CONFIG} --install config --expandvars`
+ KDE_APPSDATADIR=`${KDE_CONFIG} --install data --expandvars`'/klash'
+ else
+ KDE_PLUGINDIR=`${KDE_CONFIG} --install module`
+ KDE_SERVICESDIR=`${KDE_CONFIG} --install services`
+ KDE_CONFIGDIR=`${KDE_CONFIG} --install config`
+ KDE_APPSDATADIR=`${KDE_CONFIG} --install data`'/klash'
+ fi
else
KDE_PLUGINDIR='$(libdir)/kde3'
- KDE_SERVICESDIR='$(prefix)/share/services'
- KDE_CONFIGDIR='$(prefix)/share/config'
- KDE_APPSDATADIR='$(prefix)/share/apps/klash'
+ KDE_SERVICESDIR='$(datadir)/services'
+ KDE_CONFIGDIR='$(datadir)/config'
+ KDE_APPSDATADIR='$(datadir)/apps/klash'
fi
fi
_______________________________________________
Gnash-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-dev
