summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJohnathan Corgan2009-10-13 21:03:19 -0700
committerJohnathan Corgan2009-10-13 21:03:19 -0700
commita82c784262b9eae78f4c2157b6434495f8ff76bc (patch)
tree91d051d267e7f5eeec5ec5916cecba8fe59dd553 /config
parent70709caa2cc5990df6e735186e0d7db97f6a0944 (diff)
parentb41666e7c0fe2a8075efc14b273f74bd838f6564 (diff)
downloadgnuradio-a82c784262b9eae78f4c2157b6434495f8ff76bc.tar.gz
gnuradio-a82c784262b9eae78f4c2157b6434495f8ff76bc.tar.bz2
gnuradio-a82c784262b9eae78f4c2157b6434495f8ff76bc.zip
Merge branch 'qtmake' of git@gnuradio.org:trondeau into master
* 'qtmake' of git@gnuradio.org:trondeau: Removing ifs to clean up build system. Make no longer rebuilds gr-qtgui if no changes are made and also passes 'make distcheck'.
Diffstat (limited to 'config')
-rw-r--r--config/grc_gr_qtgui.m46
1 files changed, 0 insertions, 6 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index d9700776c..84514d7ce 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -86,12 +86,6 @@ AC_DEFUN([GRC_GR_QTGUI],[
AC_SUBST(QT_UIC_EXEC)
fi
- if test "$passed" = "no"; then
- AM_CONDITIONAL(BUILD_QT, false)
- else
- AM_CONDITIONAL(BUILD_QT, true)
- fi
-
AC_CONFIG_FILES([ \
gr-qtgui/Makefile \
gr-qtgui/src/Makefile \