diff options
| author | Josh Blum | 2011-02-25 16:11:48 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-02-25 16:11:48 -0800 |
| commit | a02bb131f68d5aa66093310c393562671e389778 (patch) | |
| tree | cc234438359b7e734bb00ac08083c2582b0db86b /config/grc_gr_uhd.m4 | |
| parent | da9e63bf4110c06d9a38f2bde3a665f1ae4addae (diff) | |
| parent | 5bb8acf24e4913d2a969db70476af65c498b032f (diff) | |
| download | gnuradio-a02bb131f68d5aa66093310c393562671e389778.tar.gz gnuradio-a02bb131f68d5aa66093310c393562671e389778.tar.bz2 gnuradio-a02bb131f68d5aa66093310c393562671e389778.zip | |
Merge branch 'gr_uhd_next' into next
Diffstat (limited to 'config/grc_gr_uhd.m4')
| -rw-r--r-- | config/grc_gr_uhd.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index e94747c1a..030b15155 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2010 Free Software Foundation, Inc. +dnl Copyright 2010-2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -26,10 +26,10 @@ AC_DEFUN([GRC_GR_UHD],[ if test $passed = yes; then dnl Don't do gr-uhd if the 'uhd' package is not installed PKG_CHECK_MODULES( - [UHD], [uhd >= 2.0.0 uhd < 3.0.0], [], - [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 2.x.x])] + [UHD], [uhd >= 3.0.0 uhd < 4.0.0], [], + [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 3.x.x])] ) - UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" + UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/include" AC_SUBST(UHD_CPPFLAGS) AC_SUBST(UHD_LIBS) @@ -40,8 +40,8 @@ AC_DEFUN([GRC_GR_UHD],[ AC_CONFIG_FILES([ \ gr-uhd/Makefile \ - gr-uhd/apps/Makefile \ gr-uhd/grc/Makefile \ + gr-uhd/include/Makefile \ gr-uhd/lib/Makefile \ gr-uhd/swig/Makefile \ gr-uhd/swig/run_tests \ |