diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/gr_python.m4 | 26 | ||||
| -rw-r--r-- | config/grc_gr_audio_alsa.m4 | 1 | ||||
| -rw-r--r-- | config/grc_gr_comedi.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gr_wxgui.m4 | 10 | ||||
| -rw-r--r-- | config/grc_grc.m4 | 15 | ||||
| -rw-r--r-- | config/grc_usrp.m4 | 2 |
6 files changed, 34 insertions, 22 deletions
diff --git a/config/gr_python.m4 b/config/gr_python.m4 index 6c862bba39..ea6df49c44 100644 --- a/config/gr_python.m4 +++ b/config/gr_python.m4 @@ -126,3 +126,29 @@ print path AC_SUBST(PYTHON_LDFLAGS) fi ]) + +# PYTHON_CHECK_MODULE +# +# Determines if a particular Python module can be imported +# +# $1 - module name +# $2 - module description +# $3 - action if found +# $4 - action if not found + +AC_DEFUN([PYTHON_CHECK_MODULE],[ + AC_MSG_CHECKING([for $2]) + python_cmd='import sys +try: + import $1 +except: + sys.exit(1)' + + if ! $PYTHON -c "$python_cmd" ; then + AC_MSG_RESULT([no]) + $4 + else + AC_MSG_RESULT([yes]) + $3 + fi +]) diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 index f5d6eb32e2..9c653c1c25 100644 --- a/config/grc_gr_audio_alsa.m4 +++ b/config/grc_gr_audio_alsa.m4 @@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[ AC_CONFIG_FILES([ \ gr-audio-alsa/Makefile \ + gr-audio-alsa/gr-audio-alsa.pc \ gr-audio-alsa/src/Makefile \ gr-audio-alsa/src/run_tests \ ]) diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4 index 531cafd2a4..2bdfacbc05 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[ dnl no : otherwise if test $passed = yes; then dnl Don't do gr-comedi if the 'comedi' library is unavailable. - PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[], + PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[], [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])]) fi diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index 476c431d2c..30c9b438b1 100644 --- a/config/grc_gr_wxgui.m4 +++ b/config/grc_gr_wxgui.m4 @@ -29,14 +29,8 @@ AC_DEFUN([GRC_GR_WXGUI],[ dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise if test $passed = yes; then - if ! ${PYTHON} -c 'import wx'; then - AC_MSG_RESULT([gr-wxgui requires wxPython, not found.]) - passed=no - fi - if ! ${PYTHON} -c 'import numpy'; then - AC_MSG_RESULT([gr-wxgui requires numpy (Numeric Python), not found.]) - passed=no - fi + PYTHON_CHECK_MODULE([wx],[Python wxWidgets wrappers],[],[passed=no]) + PYTHON_CHECK_MODULE([numpy],[Numeric Python extensions],[],[passed=no]) fi AC_CONFIG_FILES([ \ diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index b5ae52cee0..8dfbe23996 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -29,18 +29,9 @@ AC_DEFUN([GRC_GRC],[ dnl # test python dependencies dnl ######################################## if test $passed = yes; then - if ! ${PYTHON} -c 'import Cheetah'; then - AC_MSG_RESULT([grc requires the Python Cheetah templates installed, not found.]) - passed=no - fi - if ! ${PYTHON} -c 'import pygtk'; then - AC_MSG_RESULT([grc requires Python GTK wrappers installed, not found.]) - passed=no - fi - if ! ${PYTHON} -c 'import lxml'; then - AC_MSG_RESULT([grc requires libxml2 and libxslt wrappers (lxml), not found.]) - passed=no - fi + PYTHON_CHECK_MODULE([Cheetah],[Python Cheetah templates],[],[passed=no]) + PYTHON_CHECK_MODULE([pygtk],[Python GTK wrappers],[],[passed=no]) + PYTHON_CHECK_MODULE([lxml],[Python XML wrappers],[],[passed=no]) fi dnl ######################################## diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index f810748ab6..6783e99a99 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -61,7 +61,7 @@ AC_DEFUN([GRC_USRP],[ -I\${abs_top_srcdir}/usrp/firmware/include" usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la" usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband" - usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la" + usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp-inband.la" fi dnl Include the usrp-inband INCLUDES and LA |