diff options
author | Nick Foster | 2011-01-21 11:20:08 -0800 |
---|---|---|
committer | Nick Foster | 2011-01-21 11:25:15 -0800 |
commit | b6850bbdaeab5ce85d2414cfa9c8344fb6f91883 (patch) | |
tree | a734ff207bf91945bc7157dba35829a11a7653a8 /config/grc_grc.m4 | |
parent | e3600f59e76c3dc08aedfd77629b7c5c48df86af (diff) | |
parent | d429522b8cc0916c0dd8167284e9f7373f8c1663 (diff) | |
download | gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.tar.gz gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.tar.bz2 gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.zip |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into volk_rename
Conflicts:
volk/lib/Makefile.am
Diffstat (limited to 'config/grc_grc.m4')
-rw-r--r-- | config/grc_grc.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 16720b8fe..446bba3c5 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -20,7 +20,7 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GRC],[ GRC_ENABLE(grc) - GRC_CHECK_DEPENDENCY(grc, gr-wxgui) +dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false) AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS) |