[Commit-gnuradio] r9686 - in gnuradio/trunk: config grc grc/freedesktop

[jblum]

Author: jblum
Date: 2008-09-30 17:56:59 -0600 (Tue, 30 Sep 2008)
New Revision: 9686

Added:
   gnuradio/trunk/grc/freedesktop/README
Modified:
   gnuradio/trunk/config/grc_grc.m4
   gnuradio/trunk/grc/Makefile.am
Log:
robust check for xdg-utils

Modified: gnuradio/trunk/config/grc_grc.m4
===================================================================
--- gnuradio/trunk/config/grc_grc.m4    2008-09-30 23:23:13 UTC (rev 9685)
+++ gnuradio/trunk/config/grc_grc.m4    2008-09-30 23:56:59 UTC (rev 9686)
@@ -22,7 +22,8 @@
 
     GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
 
-    AC_CHECK_PROG(XDG_UTILS,xdg-mime,freedesktop,)
+    AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false)
+    AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS)
 
     dnl ########################################
     dnl # test python dependencies

Modified: gnuradio/trunk/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/Makefile.am      2008-09-30 23:23:13 UTC (rev 9685)
+++ gnuradio/trunk/grc/Makefile.am      2008-09-30 23:56:59 UTC (rev 9686)
@@ -21,8 +21,13 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-SUBDIRS = $(XDG_UTILS) \
+SUBDIRS = \
        data \
        examples \
        scripts \
        src
+
+## append freedesktop to the list of subdirs when xdg utils are present
+if XDG_UTILS
+SUBDIRS += freedesktop
+endif

Added: gnuradio/trunk/grc/freedesktop/README
===================================================================
--- gnuradio/trunk/grc/freedesktop/README                               (rev 0)
+++ gnuradio/trunk/grc/freedesktop/README       2008-09-30 23:56:59 UTC (rev 
9686)
@@ -0,0 +1,20 @@
+##################################################
+# Freedesktop Notes
+##################################################
+
+This directory contains icons, a mime type, and menu files for grc.
+Installation of these files requires a set of tools called xdg-utils.
+xdg-utils will install files in a standard way according to the 
freedesktop.org standards.
+
+Desktop enviroments that implement these standards are gnome, kde, xfce, and 
others.
+If you have one of these desktop enviroments, xdg-utils should come installed.
+If xdg-utils is not installed, then this directory will be ignored by the 
build.
+
+The gtk IconTheme module locates the installed icons for use inside the grc 
app.
+On recent versions of gtk, IconTheme ignores the icons installed into the 
default theme.
+This presents a problem for the gnome file system browser, nautilus, and the 
grc app.
+As a solution, icons are also installed under the gnome theme.
+
+*.png files - these are the icons of various sizes
+*.desktop files - these are the menu items for grc executables
+*.xml file - this is the mime type for the saved flow graphs