diff options
| author | Tom Rondeau | 2011-02-17 12:15:36 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-02-17 12:15:36 -0500 |
| commit | 090799813fee5305fc080297ce43cccc662c9f6e (patch) | |
| tree | 1be66fd89f57ab1567645a3c6954b4eb65bffda0 | |
| parent | cb35c3e28f277717d8f9f849636768d57720487f (diff) | |
| download | gnuradio-090799813fee5305fc080297ce43cccc662c9f6e.tar.gz gnuradio-090799813fee5305fc080297ce43cccc662c9f6e.tar.bz2 gnuradio-090799813fee5305fc080297ce43cccc662c9f6e.zip | |
guile: removing calls to check for guile and guile-dev. GNU Radio can once again be built without Guile.
| -rw-r--r-- | config/gr_guile.m4 | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 2 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/configure.ac b/configure.ac index ff969c27f..7546eb302 100644 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,7 @@ CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS AC_SUBST(CPPUNIT_INCLUDES) dnl see if GUILE is installed -AC_PATH_PROG(GUILE,guile) +dnl AC_PATH_PROG(GUILE,guile) dnl dnl We require the boost headers, thread lib and date_time lib. |