[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12340: Honor the config options if
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12340: Honor the config options if set |
Date: |
Thu, 29 Jul 2010 08:43:32 -0600 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12340
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-29 08:43:32 -0600
message:
Honor the config options if set
modified:
macros/kde4.m4
=== modified file 'macros/kde4.m4'
--- a/macros/kde4.m4 2010-06-23 15:40:05 +0000
+++ b/macros/kde4.m4 2010-07-29 14:43:32 +0000
@@ -198,10 +198,26 @@
esac
fi
- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
- KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
- KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
+ if test x"${with_kde4_plugindir}" != x ; then
+ KDE4_PLUGINDIR="${with_kde4_plugindir}/lib/kde4"
+ else
+ KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
+ fi
+ if test x"${with_kde4_servicesdir}" != x ; then
+ KDE4_SERVICESDIR="${with_kde4_servicesdir}/share/kde4/services"
+ else
+ KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
+ fi
+ if test x"${KDE4_CONFIGDIR}" != x ; then
+ KDE4_CONFIGDIR="${KDE4_CONFIGDIR}}/share/kde4/config"
+ else
+ KDE4_CONFIGDIR="${KDE4_PREFIX}}/share/kde4/config"
+ fi
+ if test x"${KDE4_APPSDATADIR}" != x ; then
+ KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/kde4/apps/klash"
+ else
+ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
+ fi
fi dnl end of build_kparts4
if test x"${ac_cv_path_kde4_incl}" != x ; then
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r12340: Honor the config options if set,
Rob Savoye <=