Merged r11377:11390 from jcorgan/usrp-headers in to trunk.

[debian/gnuradio] / config / grc_gruel.m4

diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4
index 81f53ce138ddd07b0571e02f9bbe687dbae63c4e..73e41be5f54ca76ba764c2b38ff1f8fd25e56f85 100644 (file)
--- a/config/grc_gruel.m4
+++ b/config/grc_gruel.m4
@@ -26,9 +26,12 @@ AC_DEFUN([GRC_GRUEL],[
     dnl   yes  : if the --enable code passed muster and all dependencies are met
     dnl   no   : otherwise
     if test $passed != with; then
-       dnl how and where to find INCLUDES and LA
-       gruel_INCLUDES="-I\${abs_top_srcdir}/gruel/src/include"
+       dnl how and where to find INCLUDES and LA and such
+       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
 
     AC_CONFIG_FILES([\
@@ -37,8 +40,17 @@ AC_DEFUN([GRC_GRUEL],[
         gruel/src/Makefile \
         gruel/src/include/Makefile \
         gruel/src/include/gruel/Makefile \
+       gruel/src/include/gruel/inet.h \
         gruel/src/lib/Makefile \
     ])
 
+    dnl Allow creating autoconf independent header files for bytesex routines
+    AC_CHECK_HEADER(arpa/inet.h, [GR_HAVE_ARPA_INET=1],[GR_HAVE_ARPA_INET=0])
+    AC_CHECK_HEADER(netinet/in.h, [GR_HAVE_NETINET_IN=1],[GR_HAVE_NETINET_IN=0])
+    AC_CHECK_HEADER(byteswap.h, [GR_HAVE_BYTESWAP=1],[GR_HAVE_BYTESWAP=0])
+    AC_SUBST(GR_HAVE_ARPA_INET)
+    AC_SUBST(GR_HAVE_NETINET_IN)
+    AC_SUBST(GR_HAVE_BYTESWAP)
+
     GRC_BUILD_CONDITIONAL(gruel,[])
 ])