From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 13 Apr 2010 15:34:46 +0000 (+0300)
Subject: Fix flawed KDE4-config detection logic
X-Git-Tag: 1.2.0-pre1~7071
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=92dda122a25f3f577cc39cf3652688fb96b12901;p=vlc

Fix flawed KDE4-config detection logic
---

diff --git a/configure.ac b/configure.ac
index a1fe8bb470..e2deb159f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4443,10 +4443,9 @@ AC_ARG_WITH(kde-solid,
 soliddatadir=""
 AS_IF([test "${with_kde_solid}" != "no"], [
   AS_IF([test "${with_kde_solid}" = "yes"], [
-    soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
-    AS_IF([test "x${soliddatadir}" = "x"], [
-      soliddatadir='$(datadir)/kde4/apps/solid/actions'
-    ])
+    kde4datadir="`${KDE4_CONFIG} --install data`"
+    AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
+    soliddatadir="${kde4datadir}/solid/actions"
   ], [
     soliddatadir="${with_kde_solid}"
   ])