diff options
| author | Tom Rondeau | 2011-02-17 15:19:45 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-02-17 15:19:45 -0500 |
| commit | ff5f0ed3b609cecf8becf8eb3d518a3ecf7fecef (patch) | |
| tree | 1be66fd89f57ab1567645a3c6954b4eb65bffda0 /config | |
| parent | 26fc07eac6a3029e2d7361b1502f69e7592e708b (diff) | |
| parent | 090799813fee5305fc080297ce43cccc662c9f6e (diff) | |
| download | gnuradio-ff5f0ed3b609cecf8becf8eb3d518a3ecf7fecef.tar.gz gnuradio-ff5f0ed3b609cecf8becf8eb3d518a3ecf7fecef.tar.bz2 gnuradio-ff5f0ed3b609cecf8becf8eb3d518a3ecf7fecef.zip | |
Merge branch 'pmt_serial_tags' into next
Diffstat (limited to 'config')
| -rw-r--r-- | config/gr_guile.m4 | 6 | ||||
| -rw-r--r-- | config/grc_gruel.m4 | 4 |
2 files changed, 5 insertions, 5 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_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="\ |