diff options
| author | Tom Rondeau | 2011-05-13 17:28:18 +0100 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-13 17:28:18 +0100 |
| commit | 3752974f8c132b5ea55f3ea0f8e9c072c83855cc (patch) | |
| tree | 93d83c00217a920c2b048340b1630a61f8fd82d2 /config | |
| parent | 8584298ae45ad1a0210e5d4ed67cdfae64a93c7c (diff) | |
| parent | f53fef3d2bc39b2020b8bce3d88b43569dd16605 (diff) | |
| download | gnuradio-3752974f8c132b5ea55f3ea0f8e9c072c83855cc.tar.gz gnuradio-3752974f8c132b5ea55f3ea0f8e9c072c83855cc.tar.bz2 gnuradio-3752974f8c132b5ea55f3ea0f8e9c072c83855cc.zip | |
Merge branch 'master' into 8psk
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gr_uhd.m4 | 1 | ||||
| -rw-r--r-- | config/usrp_sdcc.m4 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 2d571d970..111b0ae43 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -48,6 +48,7 @@ AC_DEFUN([GRC_GR_UHD],[ gr-uhd/swig/Makefile \ gr-uhd/swig/run_tests \ gr-uhd/swig/run_guile_tests \ + gr-uhd/apps/Makefile \ ]) GRC_BUILD_CONDITIONAL(gr-uhd,[ diff --git a/config/usrp_sdcc.m4 b/config/usrp_sdcc.m4 index 86f6429e5..3aae0bfa6 100644 --- a/config/usrp_sdcc.m4 +++ b/config/usrp_sdcc.m4 @@ -24,7 +24,7 @@ AC_DEFUN([USRP_SDCC], AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) if test "$XCC" = "no" -o "$XAS" = "no" ; then - AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net]) + AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net]) sdccok=no else sdcc_version_min=$1 |