diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /config/grc_gr_uhd.m4 | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
Diffstat (limited to 'config/grc_gr_uhd.m4')
| -rw-r--r-- | config/grc_gr_uhd.m4 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index e94747c1a..3cc9691e5 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,22 +26,23 @@ 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) # Use this to tell the Makefile whether to define # GR_HAVE_UHD for swig. - AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes]) fi + AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes]) + 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 \ |