[vlc-commits] commit: Avoid debianutils (which) and kdelibs (kde4-config) build-deps ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 29 21:38:48 2010 +0300| [8fc0329d0a116eb3afe03d959806281fb1574bff] | committer: Rémi Denis-Courmont 

Avoid debianutils (which) and kdelibs (kde4-config) build-deps

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

 configure.ac |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 53dab09..7021c5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4428,19 +4428,29 @@ AC_SUBST(DEFS_BIGENDIAN)
 dnl
 dnl Where to install KDE solid .desktop
 dnl
+AC_ARG_VAR([KDE4_CONFIG], [path to kde4-config utility])
+AS_IF([test "x$KDE4_CONFIG" = "x"], [
+  KDE4_CONFIG="kde4-config"
+])
+
 AC_ARG_WITH(kde-solid,
-  AS_HELP_STRING([--with-kde-solid=PATH],[KDE Solid action directory (auto)]))
-AS_IF([test "${with_kde_solid}" != "no"],[
-     AS_IF([test -z "${with_kde_solid}"],[
-          AS_IF([which kde4-config],[
-               with_kde_solid="`kde4-config --install data`/solid/actions/"
-          ])
-     ])
-],[
-     with_kde_solid=''
+  AS_HELP_STRING([--with-kde-solid=PATH],
+                 [KDE Solid actions directory (auto)]),, [
+  with_kde_solid="yes"
+])
+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'
+    ])
+  ], [
+    soliddatadir="${with_kde_solid}"
+  ])
 ])
-AC_SUBST(soliddatadir,[${with_kde_solid}])
-AM_CONDITIONAL(KDE_SOLID, [test -n ${with_kde_solid}])
+AC_SUBST(soliddatadir)
+AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"])
 
 dnl
 dnl  DLL loader copied from MPlayer copied from somewhere else (WINE ?)