[vlc-devel] [RFC PATCH 4/8] configure: move and rework kde4-config detection

Thomas Guillem thomas at gllm.fr
Wed Dec 30 19:37:01 CET 2015


---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8cde97d..9582139 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3777,6 +3777,11 @@ AS_IF([test "${enable_qt}" != "no"], [
 AM_CONDITIONAL(ENABLE_QT4, [test "$enable_qt" != "no"])
 
 dnl
+dnl detect kde4-config patch (used for kde solids and kwallet).
+dnl
+AC_CHECK_PROG(KDE4_CONFIG, kde4-config, kde4-config, no)
+
+dnl
 dnl Simple test for skins2 dependency
 dnl
 AS_IF([test "$enable_qt" = "no"], [
@@ -4128,10 +4133,6 @@ AC_SUBST(DEFS_BIGENDIAN)
 dnl
 dnl Where to install KDE solid .desktop
 dnl
-AC_ARG_VAR([KDE4_CONFIG], [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],
-- 
2.1.4



More information about the vlc-devel mailing list