From d94769a975612072dc03fa378bc79856c07cd66b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 30 Oct 2010 12:14:41 -0600
Subject: add load-extension support

---
 gr-usrp/src/usrp_swig.i | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gr-usrp/src/usrp_swig.i')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 2a47877c3..5ab594383 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -141,3 +141,13 @@ usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 %}
+
+#if SWIGGUILE
+%scheme %{
+(load-extension "libguile-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
-- 
cgit 


From 8c81cf7d318d99f508e81bffcfd4c12ba0a2966e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 16 Nov 2010 21:40:55 -0800
Subject: Fix guile related problem with gr-usrp

---
 gr-usrp/src/usrp_swig.i | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gr-usrp/src/usrp_swig.i')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 5ab594383..32f2cb41e 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -39,6 +39,7 @@
 %include "usrp_sink_c.i"
 %include "usrp_sink_s.i"
 
+#ifdef SWIGPYTHON
 //---Allow a more Pythonic interface
 %pythoncode %{
 
@@ -141,6 +142,8 @@ usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 %}
+#endif
+
 
 #if SWIGGUILE
 %scheme %{
-- 
cgit 


From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:30:54 -0800
Subject: Rename libguile- to libguile-gnuradio- to match guile library naming
 convention.

The stuff in gnuradio-core ends up with funky names, but that could
be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc.
---
 gr-usrp/src/usrp_swig.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-usrp/src/usrp_swig.i')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 32f2cb41e..b18aa50f7 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -147,7 +147,7 @@ usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+(load-extension "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
 %}
 
 %goops %{
-- 
cgit 


From 08907ee94fb6c34531d57b988324c67c26c8b747 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 10 Dec 2010 16:15:40 -0800
Subject: Use load-extension-global instead of load-extension

---
 gr-usrp/src/usrp_swig.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-usrp/src/usrp_swig.i')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index b18aa50f7..b1797d758 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -147,7 +147,7 @@ usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+(load-extension-global "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
 %}
 
 %goops %{
-- 
cgit