From cb35c3e28f277717d8f9f849636768d57720487f Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 2 Feb 2011 19:40:16 -0800
Subject: gruel: generate pmt_serial_tags with python, removes guile dependency
---
config/grc_gruel.m4 | 4 ----
1 file changed, 4 deletions(-)
(limited to 'config')
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="\
--
cgit
From 090799813fee5305fc080297ce43cccc662c9f6e Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Thu, 17 Feb 2011 12:15:36 -0500
Subject: guile: removing calls to check for guile and guile-dev. GNU Radio can
once again be built without Guile.
---
config/gr_guile.m4 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'config')
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"
--
cgit