projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving XML output files from cppunit tests to $HOME/.gnuradio/unittests.
[debian/gnuradio]
/
config
/
grc_gruel.m4
diff --git
a/config/grc_gruel.m4
b/config/grc_gruel.m4
index 365edbde05a6119dfc6522e3216cef562946ddbd..d8ac95fed63265dd3fa7a11b3e0f49a0cb14f615 100644
(file)
--- a/
config/grc_gruel.m4
+++ b/
config/grc_gruel.m4
@@
-1,4
+1,4
@@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008
,2009
Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
dnl
dnl This file is part of GNU Radio
dnl
@@
-25,9
+25,15
@@
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
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
if test $passed != with; then
dnl how and where to find INCLUDES and LA and such
- gruel_INCLUDES="-I\${abs_top_srcdir}/gruel/src/include"
+ gruel_INCLUDES="\
+-I\${abs_top_srcdir}/gruel/src/include \
+-I\${abs_top_builddir}/gruel/src/include"
gruel_LA="\${abs_top_builddir}/gruel/src/lib/libgruel.la"
gruel_LIBDIRPATH="\${abs_top_builddir}/gruel/src/lib:\${abs_top_builddir}/gruel/src/lib/.libs"
fi
gruel_LA="\${abs_top_builddir}/gruel/src/lib/libgruel.la"
gruel_LIBDIRPATH="\${abs_top_builddir}/gruel/src/lib:\${abs_top_builddir}/gruel/src/lib/.libs"
fi
@@
-40,6
+46,10
@@
AC_DEFUN([GRC_GRUEL],[
gruel/src/include/gruel/Makefile \
gruel/src/include/gruel/inet.h \
gruel/src/lib/Makefile \
gruel/src/include/gruel/Makefile \
gruel/src/include/gruel/inet.h \
gruel/src/lib/Makefile \
+ gruel/src/lib/pmt/Makefile \
+ gruel/src/lib/msg/Makefile \
+ gruel/src/scheme/Makefile \
+ gruel/src/scheme/gnuradio/Makefile \
])
dnl Allow creating autoconf independent header files for bytesex routines
])
dnl Allow creating autoconf independent header files for bytesex routines