diff options
| author | Tom Rondeau | 2011-04-06 17:10:16 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-06 17:10:16 -0400 |
| commit | 831134234e5ab6d3a29f21f89b338c9656328946 (patch) | |
| tree | 2318091e9c4140952c8780130310ceec5f29c534 /config | |
| parent | b30c79326c3eedf5ebf20be62306f0511b98a0e7 (diff) | |
| parent | eca5501969aa6175562b7e70b350cf3e6ddec603 (diff) | |
| download | gnuradio-831134234e5ab6d3a29f21f89b338c9656328946.tar.gz gnuradio-831134234e5ab6d3a29f21f89b338c9656328946.tar.bz2 gnuradio-831134234e5ab6d3a29f21f89b338c9656328946.zip | |
Merge branch 'master' into 8psk
Diffstat (limited to 'config')
| -rw-r--r-- | config/gr_qwt.m4 | 24 | ||||
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 7 |
2 files changed, 18 insertions, 13 deletions
diff --git a/config/gr_qwt.m4 b/config/gr_qwt.m4 index 16ec63819..537348ac6 100644 --- a/config/gr_qwt.m4 +++ b/config/gr_qwt.m4 @@ -59,25 +59,25 @@ AC_DEFUN([GR_QWT], dnl if not set by user if test "$qwt_incdir" = "" ; then - dnl check qwt/qwt.h (as in Fedora) + dnl check qwt-qt4/qwt.h (as in Ubuntu) AC_CHECK_HEADER( - [qwt/qwt.h], - [qwt_qwt_h=yes], - [qwt_qwt_h=no] + [qwt-qt4/qwt_double_interval.h], + [qwt_qt4_qwt_h=yes], + [qwt_qt4_qwt_h=no] ) dnl If it was found, set the flags and move on - if test "$qwt_qwt_h" = "yes" ; then - QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt" + if test "$qwt_qt4_qwt_h" = "yes" ; then + QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4" else - dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu) + dnl check qwt/qwt.h (as in Fedora) AC_CHECK_HEADER( - [qwt-qt4/qwt.h], - [qwt_qt4_qwt_h=yes], - [qwt_qt4_qwt_h=no] + [qwt/qwt_double_interval.h], + [qwt_qwt_h=yes], + [qwt_qwt_h=no] ) dnl if it was found, set the flags and move on - if test "$qwt_qt4_qwt_h" = "yes" ; then - QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4" + if test "$qwt_qwt_h" = "yes" ; then + QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt" else dnl otherwise, qwt.h wasn't found, so set the flag to no libqwt_ok=no diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 92392c883..aa9646b3c 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -85,7 +85,12 @@ AC_DEFUN([GRC_GR_QTGUI],[ gr-qtgui/src/Makefile \ gr-qtgui/src/lib/Makefile \ gr-qtgui/src/python/Makefile \ + gr-qtgui/src/python/run_tests \ ]) - GRC_BUILD_CONDITIONAL(gr-qtgui) + GRC_BUILD_CONDITIONAL(gr-qtgui,[ + dnl run_tests is created from run_tests.in. Make it executable. + AC_CONFIG_COMMANDS([run_tests_qtgui], + [chmod +x gr-qtgui/src/python/run_tests]) + ]) ]) |