Merged VRT work-in-progress from eb/vrt2 (11518:11598) into trunk.

Passes distcheck.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11600 221aa14e-8319-0410-a670-987f0aec2ac5

3 files changed, 91 insertions, 0 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index b921ec510..d6a3ad393 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -67,9 +67,11 @@ m4macros = \
 	grc_gr_trellis.m4 \
 	grc_gr_usrp.m4 \
 	grc_gr_video_sdl.m4 \
+	grc_gr_vrt.m4 \
 	grc_gr_wxgui.m4 \
 	grc_mblock.m4 \
 	grc_gruel.m4 \
+	grc_vrt.m4 \
 	gr_check_createfilemapping.m4 \
 	gr_check_mc4020.m4 \
 	gr_check_shm_open.m4 \
diff --git a/config/grc_gr_vrt.m4 b/config/grc_gr_vrt.m4
new file mode 100644
index 000000000..ff2d06347
--- /dev/null
+++ b/config/grc_gr_vrt.m4
@@ -0,0 +1,38 @@
+dnl Copyright 2008,2009 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GR_VRT],[
+    GRC_ENABLE(gr-vrt)
+
+    dnl Don't do gr-usrp if gnuradio-core or vrt skipped
+    GRC_CHECK_DEPENDENCY(gr-vrt, vrt)
+    GRC_CHECK_DEPENDENCY(gr-vrt, gnuradio-core)
+
+    AC_CONFIG_FILES([ \
+        gr-vrt/Makefile \
+	gr-vrt/gnuradio-vrt.pc \
+        gr-vrt/src/Makefile \
+        gr-vrt/src/run_tests \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-vrt,[
+	dnl run_tests is created from run_tests.in.  Make it executable.
+	AC_CONFIG_COMMANDS([run_tests_vrt], [chmod +x gr-vrt/src/run_tests])
+    ])
+])
diff --git a/config/grc_vrt.m4 b/config/grc_vrt.m4
new file mode 100644
index 000000000..d473c5581
--- /dev/null
+++ b/config/grc_vrt.m4
@@ -0,0 +1,51 @@
+dnl Copyright 2008,2009 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_VRT],[
+    GRC_ENABLE(vrt)
+
+    dnl If execution gets to here, $passed will be:
+    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 Needed for vrt_socket_opener
+	AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h)
+    fi
+    if test $passed != with; then
+	dnl how and where to find INCLUDES and LA
+	VRT_INCLUDES="-I\${abs_top_srcdir}/vrt/include"
+        VRT_LA="\${abs_top_builddir}/vrt/lib/libvrt.la"
+    fi
+
+    dnl Include the vrt INCLUDES and LA
+    AC_SUBST(VRT_INCLUDES)
+    AC_SUBST(VRT_LA)
+
+    AC_CONFIG_FILES([
+        vrt/Makefile
+        vrt/vrt.pc
+        vrt/include/Makefile
+        vrt/include/vrt/Makefile
+        vrt/lib/Makefile
+        vrt/apps/Makefile
+    ])
+
+    GRC_BUILD_CONDITIONAL(vrt)
+])