Merge branch 'next' into guile.

Passes distcheck.

* next: (32 commits)
  volk: Fix for popcnt's 64/32-bit issues.
  Using a copy of config.guess and config.sub instead of sym links.
  Including time header to qa files.
  Changed python env variable to more globally usable version.
  gr_uhd: Quick fix for make distcheck failures if UHD is not installed.
  PFB resampler: fix it this way to avoid the signed/unsigned warning.
  PFB resampler: fixes bug where filter could be looking past the number of inputs.
  resampler PFB: Sets relative rate when rate is changed.
  Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC.
  volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags.
  volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit.
  volk: May be a hack, but it was required for my 32-bit Fedora 13 to work.
  volk: Removing unnecessary shell script; last commit takes care if its functions.
  volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script.
  volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error.
  volk: Adding a few more generic-only test cases.
  volk: adding generic QA test for 16sc_magnitude_32f.
  volk: modified the configure scripts to output which architectures it will be building based on the configure tests.
  uhd: update notes in grc blocks for addressing scheme
  volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps).
  ...

3 files changed, 11 insertions, 6 deletions

diff --git a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py
index 112d88159..5902fa855 100755
--- a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py
+++ b/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py
@@ -84,7 +84,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 	<param>
 		<name>Device Addr</name>
 		<key>dev_addr</key>
-		<value>addr=192.168.10.2</value>
+		<value>addr0=192.168.10.2, addr1=192.168.10.3</value>
 		<type>string</type>
 		<hide>
 			\#if \$dev_addr()
@@ -173,9 +173,8 @@ The UHD Multi USRP $sourk.title() Block:
 
 Device Address:
 The device address is a delimited string used to locate UHD devices on your system. \\
-If left blank, the first UHD device found will be used. \\
-Used args to specify a specfic device.
-USRP2 Example: addr=192.168.10.2 192.168.10.3
+Use the device address to specify a list of devices.
+USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3
 
 Num Motherboards:
 Selects the number of USRP motherboards in this multi-USRP configuration.
diff --git a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
index 7337c71d7..66728fe28 100755
--- a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
+++ b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
@@ -160,7 +160,7 @@ The UHD Single USRP $sourk.title() Block:
 Device Address:
 The device address is a delimited string used to locate UHD devices on your system. \\
 If left blank, the first UHD device found will be used. \\
-Used args to specify a specfic device.
+Use the device address to specify a specific device.
 USRP2 Example: addr=192.168.10.2
 USRP1 Example: serial=12345678
 
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 80a6a588a..76f44a491 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// Defined during configure; avoids trying to locate
+// header files if UHD was not installed.
+#ifdef GR_HAVE_UHD
+
 ////////////////////////////////////////////////////////////////////////
 // Language independent exception handler
 ////////////////////////////////////////////////////////////////////////
@@ -111,4 +115,6 @@ static const size_t ALL_MBOARDS;
 %goops %{
 (use-modules (gnuradio gnuradio_core_runtime))
 %}
-#endif
+#endif	/* SWIGGUILE */
+
+#endif  /* GR_HAVE_UHD */