From: jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Tue, 30 Sep 2008 19:43:04 +0000 (+0000)
Subject: AC check for xdg utils
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=39f5fa920c360e84f757162572fa4aa999aea4ef;p=debian%2Fgnuradio

AC check for xdg utils

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9684 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index f82c5558..f02923f1 100644
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -22,6 +22,8 @@ AC_DEFUN([GRC_GRC],[
 
     GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
 
+    AC_CHECK_PROG(XDG_UTILS,xdg-mime,freedesktop,)
+
     dnl ########################################
     dnl # test python dependencies
     dnl ########################################
diff --git a/grc/Makefile.am b/grc/Makefile.am
index 104ff186..8b77fc31 100644
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -21,9 +21,8 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-SUBDIRS = \
+SUBDIRS = $(XDG_UTILS) \
 	data \
 	examples \
-	freedesktop \
 	scripts \
 	src
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index dbbf94ce..30073b95 100644
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -24,28 +24,26 @@ include $(top_srcdir)/grc/Makefile.inc
 sizes = 32 48 64 128 256
 
 install-data-local:
-	if test -s "`which xdg-mime`"; then \
-		for size in $(sizes); do \
-			xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \
-			xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \
-			xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \
-		done; \
-		xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml; \
-		xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop; \
-		xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \
-	fi
+	for size in $(sizes); do \
+		xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \
+		xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \
+		xdg-icon-resource install --context apps --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \
+		xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \
+	done
+	xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml
+	xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop
+	xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop
 
 uninstall-local:
-	if test -s "`which xdg-mime`"; then \
-		for size in $(sizes); do \
-			xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \
-			xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \
-			xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \
-		done; \
-		xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml; \
-		xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop; \
-		xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \
-	fi
+	for size in $(sizes); do \
+		xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \
+		xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \
+		xdg-icon-resource uninstall --context apps --theme gnome --mode system --size $${size} gnuradio-grc; \
+		xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \
+	done
+	xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml
+	xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop
+	xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop
 
 EXTRA_DIST = \
 	$(srcdir)/grc-icon-256.png \