[vlc-devel] [PATCH] Do not try to install KDE4 solid files if kde4-config is not found.

Alexis Ballier aballier at gentoo.org
Tue Apr 13 16:29:03 CEST 2010


Check for kde4-config and disable installation of solid file if it is not found.
This avoids installing the files in /solid/actions if it is not explicitly disabled.
---
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e51943c..2070315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4431,7 +4431,7 @@ 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_PATH_PROG(KDE4_CONFIG, kde4-config, [no])
 ])
 
 AC_ARG_WITH(kde-solid,
@@ -4440,7 +4440,7 @@ AC_ARG_WITH(kde-solid,
   with_kde_solid="yes"
 ])
 soliddatadir=""
-AS_IF([test "${with_kde_solid}" != "no"], [
+AS_IF([test "${with_kde_solid}" != "no" -a "x$KDE4_CONFIG" != "xno"], [
   AS_IF([test "${with_kde_solid}" = "yes"], [
     soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
     AS_IF([test "x${soliddatadir}" = "x"], [
-- 
1.7.0.4




More information about the vlc-devel mailing list