Installing KDE4 solid files.

Closes #3436

diff --git a/configure.ac b/configure.ac
index 24d577a4b113bdafb953d2ce8040b38e4cef786f..53dab09cebf2b9f81346674f98f5d33de628e972 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4425,6 +4425,23 @@ AS_IF([test "${ac_cv_c_bigendian}" = "yes"], [
 ])
 AC_SUBST(DEFS_BIGENDIAN)
 
+dnl
+dnl Where to install KDE solid .desktop
+dnl
+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=''
+])
+AC_SUBST(soliddatadir,[${with_kde_solid}])
+AM_CONDITIONAL(KDE_SOLID, [test -n ${with_kde_solid}])
+
 dnl
 dnl  DLL loader copied from MPlayer copied from somewhere else (WINE ?)
 dnl

diff --git a/share/Makefile.am b/share/Makefile.am
index b89c58c460548e2eecb32f62040cc3b799485317..182afee6847ea291164c97279adc220d2421bb47 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -34,7 +34,8 @@ EXTRA_DIST = \
        $(DIST_lua) \
        $(DIST_osdmenu_default) \
        $(DIST_mozilla) \
-       $(DIST_maemo)
+       $(DIST_maemo) \
+       $(DIST_solid)
 
 nobase_vlcdata_DATA =
 if BUILD_SKINS
@@ -55,6 +56,9 @@ endif
 if BUILD_HILDON
 nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
 endif
+if KDE_SOLID
+soliddata_DATA = $(DIST_solid)
+endif
 
 DIST_rsrc = \
        newres.h \
@@ -390,3 +394,8 @@ DIST_maemo = \
 
 maemo_FILES = \
        vlc32x32.png
+
+DIST_solid = \
+       solid/vlc-opencda.desktop \
+       solid/vlc-opendvd.desktop \
+       solid/vlc-openvcd.dekstop