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 f82c555851cb55d67f6e9e0f4ee173a9022bc73a..f02923f1695adc69e68173367ef78da429a1ec1d 100644 (file)
--- 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 104ff186b10d52fc7d6d424762a68b01176b92f0..8b77fc31a5bba87b4b3c38283a5c854be4f347b1 100644 (file)
--- 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 dbbf94ce4acb374591b7ced95fd83388f05182d7..30073b9514186de108a2382633c7bf296725ce92 100644 (file)
--- 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 \