[vlc-commits] configure: move up kde4-config detection
Thomas Guillem
git at videolan.org
Thu Jan 7 20:12:41 CET 2016
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Dec 18 11:53:39 2015 +0100| [b0ebf1463086aa37e9a34d9f9b2487544c1ad6ff] | committer: Thomas Guillem
configure: move up kde4-config detection
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0ebf1463086aa37e9a34d9f9b2487544c1ad6ff
---
configure.ac | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index d1af4e8..9cce365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3795,6 +3795,14 @@ 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_ARG_VAR([KDE4_CONFIG], [kde4-config utility])
+AS_IF([test "x$KDE4_CONFIG" = "x"], [
+ KDE4_CONFIG="kde4-config"
+])
+
+dnl
dnl Simple test for skins2 dependency
dnl
AS_IF([test "$enable_qt" = "no"], [
@@ -4146,11 +4154,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],
[KDE Solid actions directory (auto)]),, [
More information about the vlc-commits
mailing list