Skip to content

V
vlc-1.1
Commit b1cc8b64 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Jean-Baptiste Kempf
Browse files
Options

Fix flawed KDE4-config detection logic 

(cherry picked from commit 92dda122a25f3f577cc39cf3652688fb96b12901)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0de126b8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
configure.ac
View file @ b1cc8b64
...@@ -4443,10 +4443,9 @@ AC_ARG_WITH(kde-solid, ...@@ -4443,10 +4443,9 @@ AC_ARG_WITH(kde-solid,
soliddatadir="" soliddatadir=""
AS_IF([test "${with_kde_solid}" != "no"], [ AS_IF([test "${with_kde_solid}" != "no"], [
AS_IF([test "${with_kde_solid}" = "yes"], [ AS_IF([test "${with_kde_solid}" = "yes"], [
soliddatadir="`${KDE4_CONFIG} --install data`solid/actions" kde4datadir="`${KDE4_CONFIG} --install data`"
AS_IF([test "x${soliddatadir}" = "x"], [ AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
soliddatadir='$(datadir)/kde4/apps/solid/actions' soliddatadir="${kde4datadir}/solid/actions"
])
], [ ], [
soliddatadir="${with_kde_solid}" soliddatadir="${with_kde_solid}"
]) ])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment