diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 24 | ||||
| -rw-r--r-- | config/grc_gr_uhd.m4 | 1 | ||||
| -rw-r--r-- | config/grc_grc.m4 | 11 | ||||
| -rw-r--r-- | config/grc_volk.m4 | 18 |
4 files changed, 25 insertions, 29 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index aa9646b3c..ddb7c7ca9 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -47,12 +47,12 @@ AC_DEFUN([GRC_GR_QTGUI],[ if test $passed = yes; then dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS - PKG_CHECK_MODULES(QTCORE, QtCore >= 4.2, [], - [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.2.])]) - PKG_CHECK_MODULES(QTGUI, QtGui >= 4.2, [], - [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4.2.])]) - PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.2, [], - [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.2.])]) + PKG_CHECK_MODULES(QTCORE, QtCore >= 4.4, [], + [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.4.])]) + PKG_CHECK_MODULES(QTGUI, QtGui >= 4.4, [], + [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4..])]) + PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.4, [], + [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.4.])]) dnl Fetch QWT variables GR_QWT([], [passed=no]) @@ -81,16 +81,18 @@ AC_DEFUN([GRC_GR_QTGUI],[ AC_CONFIG_FILES([ \ gr-qtgui/Makefile \ + gr-qtgui/gnuradio-qtgui.pc \ + gr-qtgui/apps/Makefile \ gr-qtgui/grc/Makefile \ - gr-qtgui/src/Makefile \ - gr-qtgui/src/lib/Makefile \ - gr-qtgui/src/python/Makefile \ - gr-qtgui/src/python/run_tests \ + gr-qtgui/lib/Makefile \ + gr-qtgui/python/Makefile \ + gr-qtgui/python/run_tests \ + gr-qtgui/swig/Makefile \ ]) 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]) + [chmod +x gr-qtgui/python/run_tests]) ]) ]) diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 3cc9691e5..2d571d970 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -40,6 +40,7 @@ AC_DEFUN([GRC_GR_UHD],[ AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes]) AC_CONFIG_FILES([ \ + gr-uhd/gnuradio-uhd.pc \ gr-uhd/Makefile \ gr-uhd/grc/Makefile \ gr-uhd/include/Makefile \ diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index c21acccff..0474c4e89 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -34,17 +34,6 @@ AC_DEFUN([GRC_GRC],[ PYTHON_CHECK_MODULE([numpy],[NumPy],[],[passed=no],[True]) fi - dnl ######################################## - dnl # platform dependency pythonw - dnl ######################################## - dnl FIXME: move this test to Python config m4 - if test `${PYTHON} -c "import sys; print sys.platform"` = 'darwin'; then - PYTHONW=pythonw - else - PYTHONW=python - fi - AC_SUBST(PYTHONW) - AC_CONFIG_FILES([ \ grc/Makefile \ grc/base/Makefile \ diff --git a/config/grc_volk.m4 b/config/grc_volk.m4 index 1b3c54dd7..f349d5e99 100644 --- a/config/grc_volk.m4 +++ b/config/grc_volk.m4 @@ -21,19 +21,23 @@ AC_DEFUN([GRC_VOLK],[ GRC_ENABLE(volk) GRC_WITH(volk) - dnl volk uses a subsidiary configure.ac - AC_CONFIG_SUBDIRS([volk]) - - dnl If execution gets to here, $passed will be: - dnl with : if the --with code didn't error out + dnl If execution gets to here, test if $passed is: + dnl with : if the --with code didn't error out, use these values + dnl Test if $enable_volk is: dnl yes : if the --enable code passed muster and all dependencies are met - dnl no : otherwise - if test $passed != with; then + dnl no : otherwise, then do not set variables + if test $passed != with && test x$enable_volk == xyes; then dnl how and where to find INCLUDES and LA volk_INCLUDES="-I\${abs_top_srcdir}/volk/include" volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la \ \${abs_top_builddir}/volk/lib/libvolk_runtime.la" fi + dnl volk uses a subsidiary configure.ac + dnl only run if building Volk + if test $passed == yes && test x$enable_volk != xno; then + AC_CONFIG_SUBDIRS([volk]) + fi + GRC_BUILD_CONDITIONAL(volk, []) ]) |