[vlc-commits] commit: Fix flawed KDE4-config detection logic ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 13 18:34:46 2010 +0300| [92dda122a25f3f577cc39cf3652688fb96b12901] | committer: Rémi Denis-Courmont 

Fix flawed KDE4-config detection logic

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=92dda122a25f3f577cc39cf3652688fb96b12901
---

 configure.ac |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a1fe8bb..e2deb15 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}"
   ])