8 files changed, 22 insertions, 6 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc
index a67febe386..fee255498e 100644
--- a/gnuradio-runtime/lib/controlport/rpcmanager.cc
+++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc
@@ -24,11 +24,6 @@
 #include <iostream>
 #include <stdexcept>
 
-bool rpcmanager::booter_registered(false);
-bool rpcmanager::aggregator_registered(false);
-std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0);
-std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0);
-
 rpcmanager::rpcmanager() {;}
 
 rpcmanager::~rpcmanager() {;}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
index 8f3b4557c2..fcba1ab524 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
@@ -25,6 +25,10 @@
 #include <gnuradio/rpcserver_selector.h>
 
 bool rpcmanager::make_aggregator(false);
+bool rpcmanager::booter_registered(false);
+bool rpcmanager::aggregator_registered(false);
+std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0);
+std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0);
 
 #ifdef GR_RPCSERVER_ENABLED
 rpcmanager manager_instance;
diff --git a/gr-blocks/python/grc_gnuradio/blks2/error_rate.py b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
index 9bf387030a..df03f551b3 100644
--- a/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
@@ -75,6 +75,9 @@ class error_rate(gr.hier_block2):
             gr.io_signature(2, 2, gr.sizeof_char),
             gr.io_signature(1, 1, gr.sizeof_float),
         )
+
+        print "Warning: the blks2.error_rate is deprecated."
+
         assert type in ('BER', 'SER')
         self._max_samples = win_size
         self._bits_per_symbol = bits_per_symbol
diff --git a/gr-blocks/python/grc_gnuradio/blks2/selector.py b/gr-blocks/python/grc_gnuradio/blks2/selector.py
index 24e3844658..0a74309688 100644
--- a/gr-blocks/python/grc_gnuradio/blks2/selector.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/selector.py
@@ -40,6 +40,9 @@ class selector(gr.hier_block2):
             gr.io_signature(num_inputs, num_inputs, item_size),
             gr.io_signature(num_outputs, num_outputs, item_size),
         )
+
+        print "Warning: the blks2.selector block is deprecated."
+
         #terminator blocks for unused inputs and outputs
         self.input_terminators = [blocks.null_sink(item_size) for i in range(num_inputs)]
         self.output_terminators = [blocks.head(item_size, 0) for i in range(num_outputs)]
@@ -130,6 +133,8 @@ class valve(selector):
         else: output_index = 0
         selector.__init__(self, item_size, 1, 1, 0, output_index)
 
+        print "Warning: the blks2.valve block is deprecated."
+
     def set_open(self, open):
         """
         Callback to set open state.
diff --git a/gr-blocks/python/grc_gnuradio/blks2/tcp.py b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
index aee90fad2c..6ae24d3a7b 100644
--- a/gr-blocks/python/grc_gnuradio/blks2/tcp.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
@@ -58,6 +58,8 @@ class tcp_source(gr.hier_block2):
         fd = _get_sock_fd(addr, port, server)
         self.connect(blocks.file_descriptor_source(itemsize, fd), self)
 
+        print "Warning: the blks2.tcp_source block is deprecated."
+
 class tcp_sink(gr.hier_block2):
     def __init__(self, itemsize, addr, port, server=False):
         #init hier block
@@ -68,3 +70,5 @@ class tcp_sink(gr.hier_block2):
         )
         fd = _get_sock_fd(addr, port, server)
         self.connect(self, blocks.file_descriptor_sink(itemsize, fd))
+
+        print "Warning: the blks2.tcp_sink block is deprecated."
diff --git a/gr-digital/python/grc_gnuradio/blks2/packet.py b/gr-digital/python/grc_gnuradio/blks2/packet.py
index ef79afde64..dc06544c19 100644
--- a/gr-digital/python/grc_gnuradio/blks2/packet.py
+++ b/gr-digital/python/grc_gnuradio/blks2/packet.py
@@ -107,6 +107,8 @@ class packet_encoder(gr.hier_block2):
         #connect
         self.connect(msg_source, self)
 
+        print "Warning: the blks2.packet_encoder block is deprecated."
+
     def send_pkt(self, payload):
         """
         Wrap the payload in a packet and push onto the message queue.
@@ -184,6 +186,8 @@ class packet_decoder(gr.hier_block2):
         #start thread
         _packet_decoder_thread(msgq, callback)
 
+        print "Warning: the blks2.packet_decoder block is deprecated."
+
 ##################################################
 ## Packet Mod for OFDM Mod and Packet Encoder
 ##################################################
diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt
index f045af5ef8..cf17d0971d 100644
--- a/gr-dtv/CMakeLists.txt
+++ b/gr-dtv/CMakeLists.txt
@@ -29,6 +29,7 @@ include(GrComponent)
 
 GR_REGISTER_COMPONENT("gr-dtv" ENABLE_GR_DTV
     Boost_FOUND
+    GSL_FOUND
     ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_ANALOG
     ENABLE_GR_FILTER
diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt
index 7e98fa3b45..b3fb4c3cdd 100644
--- a/gr-dtv/swig/CMakeLists.txt
+++ b/gr-dtv/swig/CMakeLists.txt
@@ -36,7 +36,7 @@ endif(ENABLE_GR_CTRLPORT)
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/dtv)
 set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
-set(GR_SWIG_LIBRARIES gnuradio-dtv)
+set(GR_SWIG_LIBRARIES gnuradio-dtv ${GSL_LDFLAGS})
 
 GR_SWIG_MAKE(dtv_swig dtv_swig.i)