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/gr_guile.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/gr_guile.m4')
| -rw-r--r-- | config/gr_guile.m4 | 6 |
1 files changed, 5 insertions, 1 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" |