diff options
| author | Ben Reynwar | 2011-02-27 13:46:47 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2011-02-27 13:46:47 -0700 |
| commit | c783c2f959ef53b75a279ce91ce23f68fd2566ae (patch) | |
| tree | f351d567fb8b7016cf65746a4a3a28ce6193e787 /config | |
| parent | 315f45c234e2fa84fc83641c8404cc5fcdb8412e (diff) | |
| parent | a02bb131f68d5aa66093310c393562671e389778 (diff) | |
| download | gnuradio-c783c2f959ef53b75a279ce91ce23f68fd2566ae.tar.gz gnuradio-c783c2f959ef53b75a279ce91ce23f68fd2566ae.tar.bz2 gnuradio-c783c2f959ef53b75a279ce91ce23f68fd2566ae.zip | |
Merge branch 'next' into constell_obj
Diffstat (limited to 'config')
| -rw-r--r-- | config/gr_guile.m4 | 6 | ||||
| -rw-r--r-- | config/grc_gr_uhd.m4 | 10 | ||||
| -rw-r--r-- | config/grc_gruel.m4 | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index 4d8d61d43..b5879e081 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -35,7 +35,11 @@ AC_DEFUN([GUILE_DEVEL],[ GUILE_PKLIBDIR="`${GUILE_CONFIG} info pkglibdir`" GUILE_PKDATADIR="`${GUILE_CONFIG} info pkgdatadir`/site" else - AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!]) + dnl Only break on an error if we are using guile. + dnl This should be taken care of in gr_scripting.m4 and I don't know why it's not. + if test x${enable_guile} = xyes; then + AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!]) + fi GUILE_CFLAGS="" GUILE_PKLIBDIR="" GUILE_LIBS="Wl,-Bsymbolic-functions -lguile -lgmp -lcrypt" 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 \ diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4 index d8ac95fed..729571434 100644 --- a/config/grc_gruel.m4 +++ b/config/grc_gruel.m4 @@ -25,10 +25,6 @@ AC_DEFUN([GRC_GRUEL],[ dnl with : if the --with code didn't error out dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise - if test $passed = yes; then - dnl Don't do gruel if guile not available - GRC_CHECK_GUILE(gruel) - fi if test $passed != with; then dnl how and where to find INCLUDES and LA and such gruel_INCLUDES="\ |