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