[vlc-commits] commit: Installing KDE4 solid files. (Christophe Mutricy )

[git at videolan.org]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Thu Mar 25 10:50:48 2010 +0100| [b51afca9348a2c1ebca0237e5e91f9b0b6562d91] | committer: Christophe Mutricy 

Installing KDE4 solid files.

Closes #3436

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b51afca9348a2c1ebca0237e5e91f9b0b6562d91
---

 configure.ac      |   17 +++++++++++++++++
 share/Makefile.am |   11 ++++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 24d577a..53dab09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4426,6 +4426,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
 loader=false
diff --git a/share/Makefile.am b/share/Makefile.am
index b89c58c..182afee 100644
--- 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