diff options
| author | Eric Blossom | 2010-10-05 13:34:15 -0700 |
|---|---|---|
| committer | Eric Blossom | 2010-10-05 13:34:15 -0700 |
| commit | d072f53d3aafc68821e2450ac6876614dc0b1713 (patch) | |
| tree | 1cc1c229721e86c127bca69c4ba3e772229f3e45 | |
| parent | 58a9c0498ee8df542a9eddeb0179995c8f03ca8e (diff) | |
| download | gnuradio-d072f53d3aafc68821e2450ac6876614dc0b1713.tar.gz gnuradio-d072f53d3aafc68821e2450ac6876614dc0b1713.tar.bz2 gnuradio-d072f53d3aafc68821e2450ac6876614dc0b1713.zip | |
Remove vrt dependence on gruel. Should also build on non-Linux OS's too.
| -rw-r--r-- | config/grc_vrt.m4 | 16 | ||||
| -rw-r--r-- | vrt/lib/expanded_header.cc | 3 | ||||
| -rw-r--r-- | vrt/lib/expanded_if_context_section.cc | 3 |
3 files changed, 5 insertions, 17 deletions
diff --git a/config/grc_vrt.m4 b/config/grc_vrt.m4 index 982c8863a..63b0a5e35 100644 --- a/config/grc_vrt.m4 +++ b/config/grc_vrt.m4 @@ -25,8 +25,7 @@ AC_DEFUN([GRC_VRT],[ dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise if test $passed = yes; then - dnl Needed for vrt_socket_opener - AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h) + AC_CHECK_HEADERS(arpa/inet.h sys/socket.h) fi if test $passed != with; then dnl how and where to find INCLUDES and LA @@ -34,19 +33,6 @@ AC_DEFUN([GRC_VRT],[ VRT_LA="\${abs_top_builddir}/vrt/lib/libvrt.la" fi - # Test host OS compatibility - AC_MSG_CHECKING([whether host_os is linux*]) - case "$host_os" in - linux*) - AC_MSG_RESULT([yes]) - ;; - *) - AC_MSG_RESULT([no]) - AC_MSG_NOTICE([libvrt currently requires Linux host OS, not found]) - passed="no" - ;; - esac - dnl Include the vrt INCLUDES and LA AC_SUBST(VRT_INCLUDES) AC_SUBST(VRT_LA) diff --git a/vrt/lib/expanded_header.cc b/vrt/lib/expanded_header.cc index 74a156dd2..ab5e3a34e 100644 --- a/vrt/lib/expanded_header.cc +++ b/vrt/lib/expanded_header.cc @@ -23,7 +23,8 @@ #include <config.h> #endif #include <vrt/expanded_header.h> -#include <gruel/inet.h> +//#include <gruel/inet.h> +#include <arpa/inet.h> #include <boost/format.hpp> #include "header_utils.h" diff --git a/vrt/lib/expanded_if_context_section.cc b/vrt/lib/expanded_if_context_section.cc index 82acc3d1b..3f1cda4b4 100644 --- a/vrt/lib/expanded_if_context_section.cc +++ b/vrt/lib/expanded_if_context_section.cc @@ -24,7 +24,8 @@ #endif #include <vrt/expanded_if_context_section.h> #include <string.h> -#include <gruel/inet.h> // ntohl +//#include <gruel/inet.h> +#include <arpa/inet.h> #include <boost/format.hpp> #include "header_utils.h" |