]> git.sesse.net Git - vlc/commitdiff
Fix flawed KDE4-config detection logic
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 13 Apr 2010 15:34:46 +0000 (18:34 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 13 Apr 2010 15:34:46 +0000 (18:34 +0300)
configure.ac

index a1fe8bb470b80be92589f3324b03df7d257f438f..e2deb159f9bf432682d90bced26d401260ea5062 100644 (file)
@@ -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}"
   ])