[vlc-commits] [Git][videolan/vlc][master] 5 commits: configure: do not call KDE4_CONFIG if it's not an executable

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
aa09b1f9 by Steve Lhomme at 2026-08-24T04:31:33+00:00
configure: do not call KDE4_CONFIG if it's not an executable

It's set to "kde4-config" if the user doesn't set it. But it may not be there.

Avoids this warning:

> configure: line 69874: kde4-config: command not found

And soliddatadir was set to a value and used even though it's bogus.

- - - - -
995badc7 by Steve Lhomme at 2026-08-24T04:31:33+00:00
configure: set default with_kde_solid value for Windows/Apple/Android oses

Otherwise the value is not set and we and up assuming the user set a path (rather than yes=auto).

- - - - -
8641d219 by Steve Lhomme at 2026-08-24T04:31:33+00:00
share: do not use .desktop files when it's not setup properly

It's a generalization of 5b3aa85da2f9e9ee02c8d00b7bb654b5aecd3be7 and
2d70b0f688f9a91afe9dbca7fa631d833046a563. In both cases KDE_SOLID should not be true.
And other non UNIX desktop will also end up disabling this code (android, emscripten).

- - - - -
047271a3 by Steve Lhomme at 2026-08-24T04:31:33+00:00
configure: do not generate vlc.appdata.xml on non-UNIX desktop

- - - - -
de0fea00 by Steve Lhomme at 2026-08-24T04:31:33+00:00
configure: do not set a kde file path for emscripten

Same as for Windows/Apple/Android OSes. The rest is UNIX variants that may have KDE.
Or use these desktop files.

- - - - -


2 changed files:

- configure.ac
- share/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -5119,14 +5119,19 @@ AC_ARG_WITH(kde-solid,
   AS_HELP_STRING([--with-kde-solid=PATH],
                  [KDE Solid actions directory (auto)]),, [
 
-if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${VENDOR}" != "android" ; then
+if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${VENDOR}" != "android" -a "${SYS}" != "emscripten" ; then
   with_kde_solid="yes"
+else
+  with_kde_solid="no"
 fi
 ])
 soliddatadir=""
 AS_IF([test "${with_kde_solid}" != "no"], [
   AS_IF([test "${with_kde_solid}" = "yes"], [
-    kde4datadir="`${KDE4_CONFIG} --install data`"
+    dnl automatic detection of the path via KDE4_CONFIG
+    AS_IF([test -x "${KDE4_CONFIG}"], [
+      kde4datadir="`${KDE4_CONFIG} --install data`"
+    ])
     AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
     soliddatadir="${kde4datadir}/solid/actions"
   ], [
@@ -5290,7 +5295,12 @@ AC_CONFIG_FILES([
   lib/Makefile
   bin/Makefile
   test/Makefile
-  share/org.videolan.vlc.appdata.xml.in
+])
+
+AM_COND_IF([KDE_SOLID], [
+  AC_CONFIG_FILES([
+    share/org.videolan.vlc.appdata.xml.in
+  ])
 ])
 
 AM_COND_IF([HAVE_WIN32], [


=====================================
share/Makefile.am
=====================================
@@ -55,13 +55,11 @@ LUA_MODULES_PKGDATA = \
 	$(NULL)
 
 desktopdir = $(datadir)/applications
-if !HAVE_WIN32
-if !HAVE_DARWIN
+if KDE_SOLID
 desktop_DATA = vlc.desktop vlc-openbd.desktop vlc-opendvd.desktop vlc-openvcd.desktop vlc-opencda.desktop
 appdatadir = $(datarootdir)/metainfo
 appdata_DATA = org.videolan.vlc.appdata.xml
 endif
-endif
 
 EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
 EXTRA_DIST += vlc-openbd.desktop.in vlc-opendvd.desktop.in vlc-openvcd.desktop.in vlc-opencda.desktop.in



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3a49e79349810c908a375ab752384c7206388ce0...de0fea001b0dd2579e94986188f06f3b107ff644

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3a49e79349810c908a375ab752384c7206388ce0...de0fea001b0dd2579e94986188f06f3b107ff644
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help