[55234] trunk/dports/science

macsforever2000 at macports.org macsforever2000 at macports.org
Fri Aug 7 13:19:24 PDT 2009


Revision: 55234
          http://trac.macports.org/changeset/55234
Author:   macsforever2000 at macports.org
Date:     2009-08-07 13:19:23 -0700 (Fri, 07 Aug 2009)
Log Message:
-----------
New ports for gnuradio. (#18104)

Added Paths:
-----------
    trunk/dports/science/gnuradio/
    trunk/dports/science/gnuradio/Portfile
    trunk/dports/science/gnuradio-audio-jack/
    trunk/dports/science/gnuradio-audio-jack/Portfile
    trunk/dports/science/gnuradio-audio-osx/
    trunk/dports/science/gnuradio-audio-osx/Portfile
    trunk/dports/science/gnuradio-audio-portaudio/
    trunk/dports/science/gnuradio-audio-portaudio/Portfile
    trunk/dports/science/gnuradio-core/
    trunk/dports/science/gnuradio-core/Portfile
    trunk/dports/science/gnuradio-cvsd-vocoder/
    trunk/dports/science/gnuradio-cvsd-vocoder/Portfile
    trunk/dports/science/gnuradio-gpio/
    trunk/dports/science/gnuradio-gpio/Portfile
    trunk/dports/science/gnuradio-gpio/files/
    trunk/dports/science/gnuradio-gpio/files/patch-configure.diff
    trunk/dports/science/gnuradio-grc/
    trunk/dports/science/gnuradio-grc/Portfile
    trunk/dports/science/gnuradio-gruel/
    trunk/dports/science/gnuradio-gruel/Portfile
    trunk/dports/science/gnuradio-gsm-fr-vocoder/
    trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
    trunk/dports/science/gnuradio-mblock/
    trunk/dports/science/gnuradio-mblock/Portfile
    trunk/dports/science/gnuradio-omnithread/
    trunk/dports/science/gnuradio-omnithread/Portfile
    trunk/dports/science/gnuradio-pager/
    trunk/dports/science/gnuradio-pager/Portfile
    trunk/dports/science/gnuradio-pmt/
    trunk/dports/science/gnuradio-pmt/Portfile
    trunk/dports/science/gnuradio-radar-mono/
    trunk/dports/science/gnuradio-radar-mono/Portfile
    trunk/dports/science/gnuradio-radar-mono/files/
    trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff
    trunk/dports/science/gnuradio-radio-astronomy/
    trunk/dports/science/gnuradio-radio-astronomy/Portfile
    trunk/dports/science/gnuradio-sounder/
    trunk/dports/science/gnuradio-sounder/Portfile
    trunk/dports/science/gnuradio-sounder/files/
    trunk/dports/science/gnuradio-sounder/files/patch-configure.diff
    trunk/dports/science/gnuradio-trellis/
    trunk/dports/science/gnuradio-trellis/Portfile
    trunk/dports/science/gnuradio-usrp/
    trunk/dports/science/gnuradio-usrp/Portfile
    trunk/dports/science/gnuradio-usrp/files/
    trunk/dports/science/gnuradio-usrp/files/patch-configure.diff
    trunk/dports/science/gnuradio-utils/
    trunk/dports/science/gnuradio-utils/Portfile
    trunk/dports/science/gnuradio-utils/files/
    trunk/dports/science/gnuradio-utils/files/patch-configure.diff
    trunk/dports/science/gnuradio-video-sdl/
    trunk/dports/science/gnuradio-video-sdl/Portfile
    trunk/dports/science/gnuradio-wxgui/
    trunk/dports/science/gnuradio-wxgui/Portfile
    trunk/dports/science/usrp/
    trunk/dports/science/usrp/Portfile

Added: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,74 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio
+version			3.2
+maintainers		nomaintainer
+description		GNU Radio META-port installer.
+long_description GNU Radio META-port installer: \
+Provides every installable package of GNU Radio using MacPorts. \
+This package does not do any compiling or installation itself.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+distfiles
+master_sites
+
+platforms		darwin macosx
+
+depends_lib		port:gnuradio-audio-jack \
+				port:gnuradio-audio-osx \
+				port:gnuradio-audio-portaudio \
+				port:gnuradio-cvsd-vocoder \
+				port:gnuradio-gpio \
+				port:gnuradio-grc \
+				port:gnuradio-gsm-fr-vocoder \
+				port:gnuradio-pager \
+				port:gnuradio-radar-mono \
+				port:gnuradio-radio-astronomy \
+				port:gnuradio-sounder \
+				port:gnuradio-trellis \
+				port:gnuradio-usrp \
+				port:gnuradio-utils \
+				port:gnuradio-video-sdl
+
+fetch			{}
+checksum		{}
+use_configure	no
+build			{}
+destroot		{
+	xinstall -d ${destroot}${prefix}/share/doc/${name}-${version}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}-${version}/README.MacPorts"
+}
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}
+
+livecheck.check regex
+livecheck.url	http://ftp.gnu.org/gnu/gnuradio/?C=M&O=D
+livecheck.regex gnuradio-(\[0-9\.\]+\[0-9\])\\.


Property changes on: trunk/dports/science/gnuradio/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-audio-jack/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-jack/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-audio-jack/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,62 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-audio-jack
+version			3.2
+maintainers		nomaintainer
+description		JACK component of GNU Radio.
+long_description JACK component of GNU Radio: \
+Provides JACK audio source and sink blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core \
+				port:jack
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-audio-jack
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-audio-jack/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-audio-osx/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-audio-osx/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,61 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-audio-osx
+version			3.2
+maintainers		nomaintainer
+description		Mac OS X Audio component of GNU Radio.
+long_description Mac OS X Audio component of GNU Radio: \
+Provides Mac OS X native audio input and output blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-audio-osx
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-audio-osx/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-audio-portaudio/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-portaudio/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-audio-portaudio/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,62 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-audio-portaudio
+version			3.2
+maintainers		nomaintainer
+description		PortAudio component of GNU Radio.
+long_description PortAudio component of GNU Radio: \
+Provides PortAudio audio source and sink blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core \
+				port:portaudio
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-audio-portaudio
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-audio-portaudio/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-core/Portfile
===================================================================
--- trunk/dports/science/gnuradio-core/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-core/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,63 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-core
+version			3.2
+maintainers		nomaintainer
+description		GNU Radio Core component of GNU Radio.
+long_description GNU Radio Core component of GNU Radio: \
+Core functionality for all of GNU Radio.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-omnithread \
+				port:gnuradio-gruel \
+				port:swig \
+				port:gsl
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--enable-gnuradio-core
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-core/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-cvsd-vocoder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-cvsd-vocoder/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-cvsd-vocoder/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,62 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-cvsd-vocoder
+version			3.2
+maintainers		nomaintainer
+description		CVSD Vocoder component of GNU Radio.
+long_description CVSD Vocoder component of GNU Radio: \
+Provides Continuously Variable Slope Delta Modulation (CVSD) \
+vocoder source and sink blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-cvsd-vocoder
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-cvsd-vocoder/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-gpio/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gpio/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-gpio/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,62 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-gpio
+version			3.2
+maintainers		nomaintainer
+description		GPIO component of GNU Radio.
+long_description GPIO component of GNU Radio: \
+Provides GPIO block.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:usrp
+
+patchfiles		patch-configure.diff
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-usrp \
+				--enable-gr-gpio
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-gpio/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-gpio/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-gpio/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio-gpio/files/patch-configure.diff	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,1524 @@
+--- configure.orig	2009-05-26 10:48:41.000000000 -0400
++++ configure	2009-05-26 10:49:43.000000000 -0400
+@@ -785,7 +785,9 @@
+ #endif"
+ 
+ enable_option_checking=no
+-ac_subst_vars='LTLIBOBJS
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
+ with_LIBDIRPATH
+ with_SWIGDIRPATH
+ with_PYDIRPATH
+@@ -993,16 +995,6 @@
+ FUSB_TECH_darwin_FALSE
+ FUSB_TECH_darwin_TRUE
+ FUSB_TECH
+-mblock_LDFLAG
+-mblock_LIBDIRPATH
+-mblock_INCLUDEDIR
+-mblock_LA
+-mblock_INCLUDES
+-pmt_LDFLAG
+-pmt_LIBDIRPATH
+-pmt_INCLUDEDIR
+-pmt_LA
+-pmt_INCLUDES
+ gnuradio_core_LDFLAG
+ gnuradio_core_LIBDIRPATH
+ gnuradio_core_INCLUDEDIR
+@@ -1284,11 +1276,8 @@
+ enable_gnuradio_core
+ with_gnuradio_core
+ with_cblas
+-enable_pmt
+-with_pmt
+-enable_mblock
+-with_mblock
+ enable_usrp
++with_usrp
+ with_fusb_tech
+ enable_usrp2
+ enable_gr_usrp
+@@ -2023,8 +2012,6 @@
+   --enable-omnithread     Stop if omnithread fails configuration
+   --enable-gcell          Stop if gcell fails configuration
+   --enable-gnuradio-core  Stop if gnuradio-core fails configuration
+-  --enable-pmt            Stop if pmt fails configuration
+-  --enable-mblock         Stop if mblock fails configuration
+   --enable-usrp           Stop if usrp fails configuration
+   --enable-usrp2          Stop if usrp2 fails configuration
+   --enable-gr-usrp        Stop if gr-usrp fails configuration
+@@ -2107,12 +2094,9 @@
+                           specified) or PKG_CONFIG_PATH (if PATH not
+                           specified); stop if gnuradio-core not found
+   --with-cblas=<lib>      use CBLAS library <lib>
+-  --with-pmt[=PATH]       Use package pmt if installed in PATH (if specified)
++  --with-usrp[=PATH]      Use package usrp if installed in PATH (if specified)
+                           or PKG_CONFIG_PATH (if PATH not specified); stop if
+-                          pmt not found
+-  --with-mblock[=PATH]    Use package mblock if installed in PATH (if
+-                          specified) or PKG_CONFIG_PATH (if PATH not
+-                          specified); stop if mblock not found
++                          usrp not found
+   --with-fusb-tech=OS     Set fast USB technique (default=auto)
+   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
+   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+@@ -2799,7 +2783,7 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-am__api_version='1.10'
++am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -2899,16 +2883,33 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[\\\"\#\$\&\'\`$am_lf]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
++$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++case $srcdir in
++  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
++$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+       # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
++      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    rm -f conftest.file
+    if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2952,7 +2953,14 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+@@ -2962,6 +2970,115 @@
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
++if test x"${install_sh}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++  *)
++    install_sh="\${SHELL} $am_aux_dir/install-sh"
++  esac
++fi
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+@@ -3144,108 +3261,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    STRIP=$ac_ct_STRIP
+-  fi
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -3278,7 +3293,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+-	@echo done
++	@echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -3289,24 +3304,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++  am__include=include
++  am__quote=
++  _am_result=GNU
++  ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
++   case `$am_make -s -f confmf 2> /dev/null` in #(
++   *the\ am__doit\ target*)
++     am__include=.include
++     am__quote="\""
++     _am_result=BSD
++     ;;
++   esac
+ fi
+ 
+ 
+@@ -4295,6 +4310,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -4312,7 +4332,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -4322,19 +4352,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -5716,6 +5750,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -5733,7 +5772,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -5743,19 +5792,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -6400,6 +6453,9 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -6417,7 +6473,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -6427,19 +6493,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -7550,13 +7620,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:7553: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:7623: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7556: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:7626: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7559: output\"" >&5)
++  (eval echo "\"\$as_me:7629: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -8747,7 +8817,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8750 "configure"' > conftest.$ac_ext
++  echo '#line 8820 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -10018,6 +10088,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -10035,7 +10110,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -10045,19 +10130,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -10772,11 +10861,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10779: \$? = $ac_status" >&5
++   echo "$as_me:10868: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11111,11 +11200,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11203: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11118: \$? = $ac_status" >&5
++   echo "$as_me:11207: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11216,11 +11305,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11219: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11308: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11223: \$? = $ac_status" >&5
++   echo "$as_me:11312: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11271,11 +11360,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11274: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11363: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11278: \$? = $ac_status" >&5
++   echo "$as_me:11367: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14084,7 +14173,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14087 "configure"
++#line 14176 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14180,7 +14269,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14183 "configure"
++#line 14272 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16200,11 +16289,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16207: \$? = $ac_status" >&5
++   echo "$as_me:16296: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16299,11 +16388,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16306: \$? = $ac_status" >&5
++   echo "$as_me:16395: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16351,11 +16440,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16354: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16443: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16358: \$? = $ac_status" >&5
++   echo "$as_me:16447: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18354,11 +18443,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18446: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18361: \$? = $ac_status" >&5
++   echo "$as_me:18450: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18453,11 +18542,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18460: \$? = $ac_status" >&5
++   echo "$as_me:18549: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18505,11 +18594,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18508: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18597: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18512: \$? = $ac_status" >&5
++   echo "$as_me:18601: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -20847,7 +20936,7 @@
+ 
+         # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++      for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -20909,7 +20998,7 @@
+ if test "${am_cv_python_version+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20928,7 +21017,7 @@
+ if test "${am_cv_python_platform+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
++  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+ $as_echo "$am_cv_python_platform" >&6; }
+@@ -20944,12 +21033,19 @@
+ else
+   if test "x$prefix" = xNONE
+      then
+-       py_prefix_arg=
++       am_py_prefix=$ac_default_prefix
+      else
+-       py_prefix_arg=",prefix='$prefix'"
++       am_py_prefix=$prefix
+      fi
+-     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pythondir in
++     $am_py_prefix*)
++       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -20967,12 +21063,19 @@
+ else
+   if test "x$exec_prefix" = xNONE
+      then
+-       py_exec_prefix_arg=$py_prefix_arg
++       am_py_exec_prefix=$am_py_prefix
+      else
+-       py_exec_prefix_arg=",prefix='$exec_prefix'"
++       am_py_exec_prefix=$exec_prefix
+      fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pyexecdir in
++     $am_py_exec_prefix*)
++       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -33135,494 +33238,7 @@
+ 
+ 
+ 
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-pmt was given.
+-if test "${enable_pmt+set}" = set; then
+-  enableval=$enable_pmt;
+-else
+-
+-        enable_pmt=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="pmt"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-pmt was given.
+-if test "${with_pmt+set}" = set; then
+-  withval=$with_pmt; if test "x$withval" != "xyes"; then
+-		    with_pmt_val=$withval
+-		    with_pmt=yes
+-		 fi
+-fi
+-
+-    if test x$with_pmt = xyes; then
+-        if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component pmt: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_pmt_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    pmt_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    pmt_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component pmt requires guile, which was not found." >&5
+-$as_echo "Component pmt requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
+-        pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files pmt/Makefile pmt/pmt.pc pmt/doc/Makefile pmt/src/Makefile pmt/src/lib/Makefile pmt/src/scheme/Makefile pmt/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    pmt_with=no
+-    if test $passed = no; then
+-	if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt has errors; stopping." >&5
+-$as_echo "$as_me: error: Component pmt has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component pmt." >&5
+-$as_echo "Not building component pmt." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs pmt"
+-
+-    if test "x${pmt_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${pmt_INCLUDES}"
+-	else
+-	    with_INCLUDES="${pmt_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	pmt_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	pmt_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${pmt_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${pmt_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	pmt_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	pmt_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${pmt_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${pmt_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	pmt_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component pmt will be included from a pre-installed library and includes." >&5
+-$as_echo "Component pmt will be included from a pre-installed library and includes." >&6; }
+-	    pmt_with=yes
+-	else
+-	    pmt_LDFLAG=
+-            if test x$enable_pmt != xno; then
+-
+-	        build_dirs="$build_dirs pmt"
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; building." >&5
+-$as_echo "Component pmt passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; but not building." >&5
+-$as_echo "Component pmt passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs pmt"
+-        pmt_skipped=yes
+-    else
+-        pmt_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-mblock was given.
+-if test "${enable_mblock+set}" = set; then
+-  enableval=$enable_mblock;
+-else
+-
+-        enable_mblock=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="mblock"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-mblock was given.
+-if test "${with_mblock+set}" = set; then
+-  withval=$with_mblock; if test "x$withval" != "xyes"; then
+-		    with_mblock_val=$withval
+-		    with_mblock=yes
+-		 fi
+-fi
+-
+-    if test x$with_mblock = xyes; then
+-        if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component mblock: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_mblock_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    mblock_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    mblock_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$pmt_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$pmt_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component mblock requires guile, which was not found." >&5
+-$as_echo "Component mblock requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
+-        mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files mblock/Makefile mblock/mblock.pc mblock/doc/Makefile mblock/src/Makefile mblock/src/include/Makefile mblock/src/include/mblock/Makefile mblock/src/lib/Makefile mblock/src/scheme/Makefile mblock/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    mblock_with=no
+-    if test $passed = no; then
+-	if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock has errors; stopping." >&5
+-$as_echo "$as_me: error: Component mblock has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component mblock." >&5
+-$as_echo "Not building component mblock." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs mblock"
+-
+-    if test "x${mblock_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${mblock_INCLUDES}"
+-	else
+-	    with_INCLUDES="${mblock_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	mblock_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	mblock_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${mblock_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${mblock_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	mblock_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	mblock_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${mblock_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${mblock_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	mblock_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component mblock will be included from a pre-installed library and includes." >&5
+-$as_echo "Component mblock will be included from a pre-installed library and includes." >&6; }
+-	    mblock_with=yes
+-	else
+-	    mblock_LDFLAG=
+-            if test x$enable_mblock != xno; then
+-
+-	        build_dirs="$build_dirs mblock"
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; building." >&5
+-$as_echo "Component mblock passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; but not building." >&5
+-$as_echo "Component mblock passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs mblock"
+-        mblock_skipped=yes
+-    else
+-        mblock_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-			{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
++{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+ if test "${ac_cv_header_stat_broken+set}" = set; then
+   $as_echo_n "(cached) " >&6
+@@ -34226,6 +33842,92 @@
+ 
+ 
+ 
++    if test x = x; then
++        pc_comp_name="usrp"
++    else
++        pc_comp_name=""
++    fi
++
++
++# Check whether --with-usrp was given.
++if test "${with_usrp+set}" = set; then
++  withval=$with_usrp; if test "x$withval" != "xyes"; then
++		    with_usrp_val=$withval
++		    with_usrp=yes
++		 fi
++fi
++
++    if test x$with_usrp = xyes; then
++        if test x$enable_usrp = xyes; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: Cannot use both --enable and --with" >&5
++$as_echo "$as_me: error: Component usrp: Cannot use both --enable and --with" >&2;}
++   { (exit 1); exit 1; }; }
++        else
++
++        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++            l_PKG_CONFIG_PATH=$with_usrp_val
++    if test "x$l_PKG_CONFIG_PATH" != "x"; then
++        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
++
++                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++    fi
++
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with; check1=yes
++else
++
++        check1=no
++        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
++            if test "x$s_PKG_CONFIG_PATH" != "x"; then
++                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++	        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with
++else
++  passed=no
++fi
++            fi
++        fi
++        if test $passed != with; then
++            { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++fi
++
++                usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
++    usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
++    usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
++
++    if test x$check1 = xyes; then
++        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
++            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++        fi
++    fi
++
++	    :
++        fi
++    fi
++
++
++
++
+     if test $passed != no; then
+         if test $passed = yes; then
+                         if test x$omnithread_skipped = xyes; then
+@@ -45093,6 +44795,14 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++ if test -n "$EXEEXT"; then
++  am__EXEEXT_TRUE=
++  am__EXEEXT_FALSE='#'
++else
++  am__EXEEXT_TRUE='#'
++  am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -46257,22 +45967,6 @@
+     "gnuradio-core/src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/tests/Makefile" ;;
+     "gnuradio-core/src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/utils/Makefile" ;;
+     "run_tests_core") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_core" ;;
+-    "pmt/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/Makefile" ;;
+-    "pmt/pmt.pc") CONFIG_FILES="$CONFIG_FILES pmt/pmt.pc" ;;
+-    "pmt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/doc/Makefile" ;;
+-    "pmt/src/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/Makefile" ;;
+-    "pmt/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/lib/Makefile" ;;
+-    "pmt/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/Makefile" ;;
+-    "pmt/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/gnuradio/Makefile" ;;
+-    "mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/Makefile" ;;
+-    "mblock/mblock.pc") CONFIG_FILES="$CONFIG_FILES mblock/mblock.pc" ;;
+-    "mblock/doc/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/doc/Makefile" ;;
+-    "mblock/src/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/Makefile" ;;
+-    "mblock/src/include/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/Makefile" ;;
+-    "mblock/src/include/mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/mblock/Makefile" ;;
+-    "mblock/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/lib/Makefile" ;;
+-    "mblock/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/Makefile" ;;
+-    "mblock/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/gnuradio/Makefile" ;;
+     "usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/Makefile" ;;
+     "usrp/usrp.pc") CONFIG_FILES="$CONFIG_FILES usrp/usrp.pc" ;;
+     "usrp/usrp.iss") CONFIG_FILES="$CONFIG_FILES usrp/usrp.iss" ;;

Added: trunk/dports/science/gnuradio-grc/Portfile
===================================================================
--- trunk/dports/science/gnuradio-grc/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-grc/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,69 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-grc
+version			3.2
+maintainers		nomaintainer
+description		GRC component of GNU Radio.
+long_description GRC component of GNU Radio: \
+GNU Radio Companion (GRC): Graphical interface to editing, \
+creating, and running applications which use GNU Radio.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-wxgui
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--with-gr-wxgui \
+				--enable-grc
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25 \
+						port:py25-lxml \
+						port:py25-cheetah \
+						port:py25-gtk
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26 \
+						port:py26-lxml \
+						port:py26-cheetah \
+						port:py26-gtk
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-grc/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-gruel/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gruel/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-gruel/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,70 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-gruel
+version			3.2
+maintainers		nomaintainer
+description		GRUEL component of GNU Radio.
+long_description GRUEL component of GNU Radio: \
+GNU Radio Utility Etcetera Library - \
+a collection of low-level routines to avoid dependencies \
+on the full GNU Radio core or other libraries.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+# gruel gets built by the main configure script, which requires a
+# whole slew of ports; no other ports are actually required, but we
+# have to make configure happy ;)
+
+depends_lib		port:pkgconfig \
+				port:gawk \
+				port:libtool \
+				port:zlib \
+				port:boost \
+				port:cppunit \
+				port:fftw-3-single
+
+configure.args	--disable-all-components \
+				--enable-gruel
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-gruel/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,61 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-gsm-fr-vocoder
+version			3.2
+maintainers		nomaintainer
+description		GSM FR Vocoder Component of GNU Radio.
+long_description GSM FR Vocoder Component of GNU Radio: \
+Provides GSM FR voice encoder and decoder blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-gsm-fr-vocoder
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-mblock/Portfile
===================================================================
--- trunk/dports/science/gnuradio-mblock/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-mblock/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,62 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-mblock
+version			3.2
+maintainers		nomaintainer
+description		Message block GNU Radio component.
+long_description Message block GNU Radio component: \
+Message blocks (or m-blocks) are a GNU Radio extension, \
+designed in cooperation with BBN, that allows more natural \
+handling of packet-based data.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-pmt
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-pmt \
+				--enable-mblock
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-mblock/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-omnithread/Portfile
===================================================================
--- trunk/dports/science/gnuradio-omnithread/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-omnithread/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,68 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-omnithread
+version			3.2
+maintainers		nomaintainer
+description		Omnithread component of GNU Radio.
+long_description Omnithread component of GNU Radio: \
+a cross-platform C++ thread library.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+# omnithread gets built by the main configure script, which requires a
+# whole slew of ports; no other ports are actually required, but we
+# have to make configure happy ;)
+
+depends_lib		port:pkgconfig \
+				port:gawk \
+				port:libtool \
+				port:zlib \
+				port:boost \
+				port:cppunit \
+				port:fftw-3-single
+
+configure.args	--disable-all-components \
+				--enable-omnithread
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-omnithread/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-pager/Portfile
===================================================================
--- trunk/dports/science/gnuradio-pager/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-pager/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,61 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-pager
+version			3.2
+maintainers		nomaintainer
+description		Pager Component of GNU Radio.
+long_description Pager Component of GNU Radio: \
+Provides FLEX radio-pager receiver / demodulator block.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-pager
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-pager/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-pmt/Portfile
===================================================================
--- trunk/dports/science/gnuradio-pmt/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-pmt/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,60 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-pmt
+version			3.2
+maintainers		nomaintainer
+description		PMT component of GNU Radio.
+long_description PMT component of GNU Radio: \
+polymorphic types using C++.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-omnithread \
+				port:guile
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--enable-pmt
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-pmt/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-radar-mono/Portfile
===================================================================
--- trunk/dports/science/gnuradio-radar-mono/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-radar-mono/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,68 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-radar-mono
+version			3.2
+maintainers		nomaintainer
+description		Radar Mono Component of GNU Radio.
+long_description Radar Mono Component of GNU Radio: \
+Provides monostatic radar transmitter and receiver blocks. \
+It uses a custom FPGA build to generate a linear \
+FM chirp waveform directly in the USRP. Echo returns are recorded \
+to a file for offline analysis.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core \
+				port:usrp
+
+patchfiles		patch-configure.diff
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--with-usrp \
+				--enable-gr-radar-mono
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-radar-mono/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,1524 @@
+--- configure.orig	2009-05-26 10:48:41.000000000 -0400
++++ configure	2009-05-26 10:49:43.000000000 -0400
+@@ -785,7 +785,9 @@
+ #endif"
+ 
+ enable_option_checking=no
+-ac_subst_vars='LTLIBOBJS
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
+ with_LIBDIRPATH
+ with_SWIGDIRPATH
+ with_PYDIRPATH
+@@ -993,16 +995,6 @@
+ FUSB_TECH_darwin_FALSE
+ FUSB_TECH_darwin_TRUE
+ FUSB_TECH
+-mblock_LDFLAG
+-mblock_LIBDIRPATH
+-mblock_INCLUDEDIR
+-mblock_LA
+-mblock_INCLUDES
+-pmt_LDFLAG
+-pmt_LIBDIRPATH
+-pmt_INCLUDEDIR
+-pmt_LA
+-pmt_INCLUDES
+ gnuradio_core_LDFLAG
+ gnuradio_core_LIBDIRPATH
+ gnuradio_core_INCLUDEDIR
+@@ -1284,11 +1276,8 @@
+ enable_gnuradio_core
+ with_gnuradio_core
+ with_cblas
+-enable_pmt
+-with_pmt
+-enable_mblock
+-with_mblock
+ enable_usrp
++with_usrp
+ with_fusb_tech
+ enable_usrp2
+ enable_gr_usrp
+@@ -2023,8 +2012,6 @@
+   --enable-omnithread     Stop if omnithread fails configuration
+   --enable-gcell          Stop if gcell fails configuration
+   --enable-gnuradio-core  Stop if gnuradio-core fails configuration
+-  --enable-pmt            Stop if pmt fails configuration
+-  --enable-mblock         Stop if mblock fails configuration
+   --enable-usrp           Stop if usrp fails configuration
+   --enable-usrp2          Stop if usrp2 fails configuration
+   --enable-gr-usrp        Stop if gr-usrp fails configuration
+@@ -2107,12 +2094,9 @@
+                           specified) or PKG_CONFIG_PATH (if PATH not
+                           specified); stop if gnuradio-core not found
+   --with-cblas=<lib>      use CBLAS library <lib>
+-  --with-pmt[=PATH]       Use package pmt if installed in PATH (if specified)
++  --with-usrp[=PATH]      Use package usrp if installed in PATH (if specified)
+                           or PKG_CONFIG_PATH (if PATH not specified); stop if
+-                          pmt not found
+-  --with-mblock[=PATH]    Use package mblock if installed in PATH (if
+-                          specified) or PKG_CONFIG_PATH (if PATH not
+-                          specified); stop if mblock not found
++                          usrp not found
+   --with-fusb-tech=OS     Set fast USB technique (default=auto)
+   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
+   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+@@ -2799,7 +2783,7 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-am__api_version='1.10'
++am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -2899,16 +2883,33 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[\\\"\#\$\&\'\`$am_lf]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
++$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++case $srcdir in
++  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
++$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+       # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
++      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    rm -f conftest.file
+    if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2952,7 +2953,14 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+@@ -2962,6 +2970,115 @@
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
++if test x"${install_sh}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++  *)
++    install_sh="\${SHELL} $am_aux_dir/install-sh"
++  esac
++fi
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+@@ -3144,108 +3261,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    STRIP=$ac_ct_STRIP
+-  fi
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -3278,7 +3293,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+-	@echo done
++	@echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -3289,24 +3304,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++  am__include=include
++  am__quote=
++  _am_result=GNU
++  ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
++   case `$am_make -s -f confmf 2> /dev/null` in #(
++   *the\ am__doit\ target*)
++     am__include=.include
++     am__quote="\""
++     _am_result=BSD
++     ;;
++   esac
+ fi
+ 
+ 
+@@ -4295,6 +4310,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -4312,7 +4332,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -4322,19 +4352,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -5716,6 +5750,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -5733,7 +5772,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -5743,19 +5792,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -6400,6 +6453,9 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -6417,7 +6473,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -6427,19 +6493,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -7550,13 +7620,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:7553: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:7623: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7556: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:7626: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7559: output\"" >&5)
++  (eval echo "\"\$as_me:7629: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -8747,7 +8817,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8750 "configure"' > conftest.$ac_ext
++  echo '#line 8820 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -10018,6 +10088,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -10035,7 +10110,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -10045,19 +10130,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -10772,11 +10861,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10779: \$? = $ac_status" >&5
++   echo "$as_me:10868: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11111,11 +11200,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11203: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11118: \$? = $ac_status" >&5
++   echo "$as_me:11207: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11216,11 +11305,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11219: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11308: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11223: \$? = $ac_status" >&5
++   echo "$as_me:11312: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11271,11 +11360,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11274: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11363: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11278: \$? = $ac_status" >&5
++   echo "$as_me:11367: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14084,7 +14173,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14087 "configure"
++#line 14176 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14180,7 +14269,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14183 "configure"
++#line 14272 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16200,11 +16289,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16207: \$? = $ac_status" >&5
++   echo "$as_me:16296: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16299,11 +16388,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16306: \$? = $ac_status" >&5
++   echo "$as_me:16395: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16351,11 +16440,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16354: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16443: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16358: \$? = $ac_status" >&5
++   echo "$as_me:16447: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18354,11 +18443,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18446: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18361: \$? = $ac_status" >&5
++   echo "$as_me:18450: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18453,11 +18542,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18460: \$? = $ac_status" >&5
++   echo "$as_me:18549: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18505,11 +18594,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18508: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18597: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18512: \$? = $ac_status" >&5
++   echo "$as_me:18601: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -20847,7 +20936,7 @@
+ 
+         # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++      for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -20909,7 +20998,7 @@
+ if test "${am_cv_python_version+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20928,7 +21017,7 @@
+ if test "${am_cv_python_platform+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
++  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+ $as_echo "$am_cv_python_platform" >&6; }
+@@ -20944,12 +21033,19 @@
+ else
+   if test "x$prefix" = xNONE
+      then
+-       py_prefix_arg=
++       am_py_prefix=$ac_default_prefix
+      else
+-       py_prefix_arg=",prefix='$prefix'"
++       am_py_prefix=$prefix
+      fi
+-     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pythondir in
++     $am_py_prefix*)
++       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -20967,12 +21063,19 @@
+ else
+   if test "x$exec_prefix" = xNONE
+      then
+-       py_exec_prefix_arg=$py_prefix_arg
++       am_py_exec_prefix=$am_py_prefix
+      else
+-       py_exec_prefix_arg=",prefix='$exec_prefix'"
++       am_py_exec_prefix=$exec_prefix
+      fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pyexecdir in
++     $am_py_exec_prefix*)
++       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -33135,494 +33238,7 @@
+ 
+ 
+ 
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-pmt was given.
+-if test "${enable_pmt+set}" = set; then
+-  enableval=$enable_pmt;
+-else
+-
+-        enable_pmt=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="pmt"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-pmt was given.
+-if test "${with_pmt+set}" = set; then
+-  withval=$with_pmt; if test "x$withval" != "xyes"; then
+-		    with_pmt_val=$withval
+-		    with_pmt=yes
+-		 fi
+-fi
+-
+-    if test x$with_pmt = xyes; then
+-        if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component pmt: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_pmt_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    pmt_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    pmt_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component pmt requires guile, which was not found." >&5
+-$as_echo "Component pmt requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
+-        pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files pmt/Makefile pmt/pmt.pc pmt/doc/Makefile pmt/src/Makefile pmt/src/lib/Makefile pmt/src/scheme/Makefile pmt/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    pmt_with=no
+-    if test $passed = no; then
+-	if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt has errors; stopping." >&5
+-$as_echo "$as_me: error: Component pmt has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component pmt." >&5
+-$as_echo "Not building component pmt." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs pmt"
+-
+-    if test "x${pmt_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${pmt_INCLUDES}"
+-	else
+-	    with_INCLUDES="${pmt_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	pmt_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	pmt_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${pmt_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${pmt_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	pmt_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	pmt_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${pmt_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${pmt_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	pmt_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component pmt will be included from a pre-installed library and includes." >&5
+-$as_echo "Component pmt will be included from a pre-installed library and includes." >&6; }
+-	    pmt_with=yes
+-	else
+-	    pmt_LDFLAG=
+-            if test x$enable_pmt != xno; then
+-
+-	        build_dirs="$build_dirs pmt"
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; building." >&5
+-$as_echo "Component pmt passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; but not building." >&5
+-$as_echo "Component pmt passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs pmt"
+-        pmt_skipped=yes
+-    else
+-        pmt_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-mblock was given.
+-if test "${enable_mblock+set}" = set; then
+-  enableval=$enable_mblock;
+-else
+-
+-        enable_mblock=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="mblock"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-mblock was given.
+-if test "${with_mblock+set}" = set; then
+-  withval=$with_mblock; if test "x$withval" != "xyes"; then
+-		    with_mblock_val=$withval
+-		    with_mblock=yes
+-		 fi
+-fi
+-
+-    if test x$with_mblock = xyes; then
+-        if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component mblock: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_mblock_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    mblock_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    mblock_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$pmt_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$pmt_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component mblock requires guile, which was not found." >&5
+-$as_echo "Component mblock requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
+-        mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files mblock/Makefile mblock/mblock.pc mblock/doc/Makefile mblock/src/Makefile mblock/src/include/Makefile mblock/src/include/mblock/Makefile mblock/src/lib/Makefile mblock/src/scheme/Makefile mblock/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    mblock_with=no
+-    if test $passed = no; then
+-	if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock has errors; stopping." >&5
+-$as_echo "$as_me: error: Component mblock has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component mblock." >&5
+-$as_echo "Not building component mblock." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs mblock"
+-
+-    if test "x${mblock_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${mblock_INCLUDES}"
+-	else
+-	    with_INCLUDES="${mblock_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	mblock_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	mblock_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${mblock_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${mblock_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	mblock_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	mblock_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${mblock_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${mblock_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	mblock_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component mblock will be included from a pre-installed library and includes." >&5
+-$as_echo "Component mblock will be included from a pre-installed library and includes." >&6; }
+-	    mblock_with=yes
+-	else
+-	    mblock_LDFLAG=
+-            if test x$enable_mblock != xno; then
+-
+-	        build_dirs="$build_dirs mblock"
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; building." >&5
+-$as_echo "Component mblock passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; but not building." >&5
+-$as_echo "Component mblock passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs mblock"
+-        mblock_skipped=yes
+-    else
+-        mblock_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-			{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
++{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+ if test "${ac_cv_header_stat_broken+set}" = set; then
+   $as_echo_n "(cached) " >&6
+@@ -34226,6 +33842,92 @@
+ 
+ 
+ 
++    if test x = x; then
++        pc_comp_name="usrp"
++    else
++        pc_comp_name=""
++    fi
++
++
++# Check whether --with-usrp was given.
++if test "${with_usrp+set}" = set; then
++  withval=$with_usrp; if test "x$withval" != "xyes"; then
++		    with_usrp_val=$withval
++		    with_usrp=yes
++		 fi
++fi
++
++    if test x$with_usrp = xyes; then
++        if test x$enable_usrp = xyes; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: Cannot use both --enable and --with" >&5
++$as_echo "$as_me: error: Component usrp: Cannot use both --enable and --with" >&2;}
++   { (exit 1); exit 1; }; }
++        else
++
++        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++            l_PKG_CONFIG_PATH=$with_usrp_val
++    if test "x$l_PKG_CONFIG_PATH" != "x"; then
++        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
++
++                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++    fi
++
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with; check1=yes
++else
++
++        check1=no
++        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
++            if test "x$s_PKG_CONFIG_PATH" != "x"; then
++                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++	        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with
++else
++  passed=no
++fi
++            fi
++        fi
++        if test $passed != with; then
++            { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++fi
++
++                usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
++    usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
++    usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
++
++    if test x$check1 = xyes; then
++        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
++            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++        fi
++    fi
++
++	    :
++        fi
++    fi
++
++
++
++
+     if test $passed != no; then
+         if test $passed = yes; then
+                         if test x$omnithread_skipped = xyes; then
+@@ -45093,6 +44795,14 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++ if test -n "$EXEEXT"; then
++  am__EXEEXT_TRUE=
++  am__EXEEXT_FALSE='#'
++else
++  am__EXEEXT_TRUE='#'
++  am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -46257,22 +45967,6 @@
+     "gnuradio-core/src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/tests/Makefile" ;;
+     "gnuradio-core/src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/utils/Makefile" ;;
+     "run_tests_core") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_core" ;;
+-    "pmt/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/Makefile" ;;
+-    "pmt/pmt.pc") CONFIG_FILES="$CONFIG_FILES pmt/pmt.pc" ;;
+-    "pmt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/doc/Makefile" ;;
+-    "pmt/src/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/Makefile" ;;
+-    "pmt/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/lib/Makefile" ;;
+-    "pmt/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/Makefile" ;;
+-    "pmt/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/gnuradio/Makefile" ;;
+-    "mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/Makefile" ;;
+-    "mblock/mblock.pc") CONFIG_FILES="$CONFIG_FILES mblock/mblock.pc" ;;
+-    "mblock/doc/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/doc/Makefile" ;;
+-    "mblock/src/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/Makefile" ;;
+-    "mblock/src/include/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/Makefile" ;;
+-    "mblock/src/include/mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/mblock/Makefile" ;;
+-    "mblock/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/lib/Makefile" ;;
+-    "mblock/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/Makefile" ;;
+-    "mblock/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/gnuradio/Makefile" ;;
+     "usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/Makefile" ;;
+     "usrp/usrp.pc") CONFIG_FILES="$CONFIG_FILES usrp/usrp.pc" ;;
+     "usrp/usrp.iss") CONFIG_FILES="$CONFIG_FILES usrp/usrp.iss" ;;

Added: trunk/dports/science/gnuradio-radio-astronomy/Portfile
===================================================================
--- trunk/dports/science/gnuradio-radio-astronomy/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-radio-astronomy/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,61 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-radio-astronomy
+version			3.2
+maintainers		nomaintainer
+description		Radio Astronomy component of GNU Radio.
+long_description Radio Astronomy of GNU Radio: \
+Provides Radio Astronomy blocks and scripts.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-radio-astronomy
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-radio-astronomy/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-sounder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-sounder/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-sounder/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,65 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-sounder
+version			3.2
+maintainers		nomaintainer
+description		Sounder component of GNU Radio.
+long_description Sounder of GNU Radio: \
+Provides blocks and scripts for determining the impulse response of a channel.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core \
+				port:usrp
+
+patchfiles		patch-configure.diff
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--with-usrp \
+				--enable-gr-sounder
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-sounder/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-sounder/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-sounder/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio-sounder/files/patch-configure.diff	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,1524 @@
+--- configure.orig	2009-05-26 10:48:41.000000000 -0400
++++ configure	2009-05-26 10:49:43.000000000 -0400
+@@ -785,7 +785,9 @@
+ #endif"
+ 
+ enable_option_checking=no
+-ac_subst_vars='LTLIBOBJS
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
+ with_LIBDIRPATH
+ with_SWIGDIRPATH
+ with_PYDIRPATH
+@@ -993,16 +995,6 @@
+ FUSB_TECH_darwin_FALSE
+ FUSB_TECH_darwin_TRUE
+ FUSB_TECH
+-mblock_LDFLAG
+-mblock_LIBDIRPATH
+-mblock_INCLUDEDIR
+-mblock_LA
+-mblock_INCLUDES
+-pmt_LDFLAG
+-pmt_LIBDIRPATH
+-pmt_INCLUDEDIR
+-pmt_LA
+-pmt_INCLUDES
+ gnuradio_core_LDFLAG
+ gnuradio_core_LIBDIRPATH
+ gnuradio_core_INCLUDEDIR
+@@ -1284,11 +1276,8 @@
+ enable_gnuradio_core
+ with_gnuradio_core
+ with_cblas
+-enable_pmt
+-with_pmt
+-enable_mblock
+-with_mblock
+ enable_usrp
++with_usrp
+ with_fusb_tech
+ enable_usrp2
+ enable_gr_usrp
+@@ -2023,8 +2012,6 @@
+   --enable-omnithread     Stop if omnithread fails configuration
+   --enable-gcell          Stop if gcell fails configuration
+   --enable-gnuradio-core  Stop if gnuradio-core fails configuration
+-  --enable-pmt            Stop if pmt fails configuration
+-  --enable-mblock         Stop if mblock fails configuration
+   --enable-usrp           Stop if usrp fails configuration
+   --enable-usrp2          Stop if usrp2 fails configuration
+   --enable-gr-usrp        Stop if gr-usrp fails configuration
+@@ -2107,12 +2094,9 @@
+                           specified) or PKG_CONFIG_PATH (if PATH not
+                           specified); stop if gnuradio-core not found
+   --with-cblas=<lib>      use CBLAS library <lib>
+-  --with-pmt[=PATH]       Use package pmt if installed in PATH (if specified)
++  --with-usrp[=PATH]      Use package usrp if installed in PATH (if specified)
+                           or PKG_CONFIG_PATH (if PATH not specified); stop if
+-                          pmt not found
+-  --with-mblock[=PATH]    Use package mblock if installed in PATH (if
+-                          specified) or PKG_CONFIG_PATH (if PATH not
+-                          specified); stop if mblock not found
++                          usrp not found
+   --with-fusb-tech=OS     Set fast USB technique (default=auto)
+   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
+   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+@@ -2799,7 +2783,7 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-am__api_version='1.10'
++am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -2899,16 +2883,33 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[\\\"\#\$\&\'\`$am_lf]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
++$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++case $srcdir in
++  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
++$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+       # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
++      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    rm -f conftest.file
+    if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2952,7 +2953,14 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+@@ -2962,6 +2970,115 @@
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
++if test x"${install_sh}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++  *)
++    install_sh="\${SHELL} $am_aux_dir/install-sh"
++  esac
++fi
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+@@ -3144,108 +3261,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    STRIP=$ac_ct_STRIP
+-  fi
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -3278,7 +3293,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+-	@echo done
++	@echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -3289,24 +3304,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++  am__include=include
++  am__quote=
++  _am_result=GNU
++  ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
++   case `$am_make -s -f confmf 2> /dev/null` in #(
++   *the\ am__doit\ target*)
++     am__include=.include
++     am__quote="\""
++     _am_result=BSD
++     ;;
++   esac
+ fi
+ 
+ 
+@@ -4295,6 +4310,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -4312,7 +4332,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -4322,19 +4352,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -5716,6 +5750,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -5733,7 +5772,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -5743,19 +5792,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -6400,6 +6453,9 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -6417,7 +6473,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -6427,19 +6493,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -7550,13 +7620,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:7553: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:7623: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7556: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:7626: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7559: output\"" >&5)
++  (eval echo "\"\$as_me:7629: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -8747,7 +8817,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8750 "configure"' > conftest.$ac_ext
++  echo '#line 8820 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -10018,6 +10088,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -10035,7 +10110,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -10045,19 +10130,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -10772,11 +10861,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10779: \$? = $ac_status" >&5
++   echo "$as_me:10868: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11111,11 +11200,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11203: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11118: \$? = $ac_status" >&5
++   echo "$as_me:11207: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11216,11 +11305,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11219: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11308: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11223: \$? = $ac_status" >&5
++   echo "$as_me:11312: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11271,11 +11360,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11274: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11363: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11278: \$? = $ac_status" >&5
++   echo "$as_me:11367: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14084,7 +14173,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14087 "configure"
++#line 14176 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14180,7 +14269,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14183 "configure"
++#line 14272 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16200,11 +16289,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16207: \$? = $ac_status" >&5
++   echo "$as_me:16296: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16299,11 +16388,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16306: \$? = $ac_status" >&5
++   echo "$as_me:16395: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16351,11 +16440,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16354: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16443: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16358: \$? = $ac_status" >&5
++   echo "$as_me:16447: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18354,11 +18443,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18446: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18361: \$? = $ac_status" >&5
++   echo "$as_me:18450: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18453,11 +18542,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18460: \$? = $ac_status" >&5
++   echo "$as_me:18549: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18505,11 +18594,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18508: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18597: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18512: \$? = $ac_status" >&5
++   echo "$as_me:18601: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -20847,7 +20936,7 @@
+ 
+         # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++      for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -20909,7 +20998,7 @@
+ if test "${am_cv_python_version+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20928,7 +21017,7 @@
+ if test "${am_cv_python_platform+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
++  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+ $as_echo "$am_cv_python_platform" >&6; }
+@@ -20944,12 +21033,19 @@
+ else
+   if test "x$prefix" = xNONE
+      then
+-       py_prefix_arg=
++       am_py_prefix=$ac_default_prefix
+      else
+-       py_prefix_arg=",prefix='$prefix'"
++       am_py_prefix=$prefix
+      fi
+-     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pythondir in
++     $am_py_prefix*)
++       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -20967,12 +21063,19 @@
+ else
+   if test "x$exec_prefix" = xNONE
+      then
+-       py_exec_prefix_arg=$py_prefix_arg
++       am_py_exec_prefix=$am_py_prefix
+      else
+-       py_exec_prefix_arg=",prefix='$exec_prefix'"
++       am_py_exec_prefix=$exec_prefix
+      fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pyexecdir in
++     $am_py_exec_prefix*)
++       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -33135,494 +33238,7 @@
+ 
+ 
+ 
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-pmt was given.
+-if test "${enable_pmt+set}" = set; then
+-  enableval=$enable_pmt;
+-else
+-
+-        enable_pmt=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="pmt"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-pmt was given.
+-if test "${with_pmt+set}" = set; then
+-  withval=$with_pmt; if test "x$withval" != "xyes"; then
+-		    with_pmt_val=$withval
+-		    with_pmt=yes
+-		 fi
+-fi
+-
+-    if test x$with_pmt = xyes; then
+-        if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component pmt: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_pmt_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    pmt_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    pmt_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component pmt requires guile, which was not found." >&5
+-$as_echo "Component pmt requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
+-        pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files pmt/Makefile pmt/pmt.pc pmt/doc/Makefile pmt/src/Makefile pmt/src/lib/Makefile pmt/src/scheme/Makefile pmt/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    pmt_with=no
+-    if test $passed = no; then
+-	if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt has errors; stopping." >&5
+-$as_echo "$as_me: error: Component pmt has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component pmt." >&5
+-$as_echo "Not building component pmt." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs pmt"
+-
+-    if test "x${pmt_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${pmt_INCLUDES}"
+-	else
+-	    with_INCLUDES="${pmt_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	pmt_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	pmt_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${pmt_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${pmt_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	pmt_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	pmt_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${pmt_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${pmt_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	pmt_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component pmt will be included from a pre-installed library and includes." >&5
+-$as_echo "Component pmt will be included from a pre-installed library and includes." >&6; }
+-	    pmt_with=yes
+-	else
+-	    pmt_LDFLAG=
+-            if test x$enable_pmt != xno; then
+-
+-	        build_dirs="$build_dirs pmt"
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; building." >&5
+-$as_echo "Component pmt passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; but not building." >&5
+-$as_echo "Component pmt passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs pmt"
+-        pmt_skipped=yes
+-    else
+-        pmt_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-mblock was given.
+-if test "${enable_mblock+set}" = set; then
+-  enableval=$enable_mblock;
+-else
+-
+-        enable_mblock=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="mblock"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-mblock was given.
+-if test "${with_mblock+set}" = set; then
+-  withval=$with_mblock; if test "x$withval" != "xyes"; then
+-		    with_mblock_val=$withval
+-		    with_mblock=yes
+-		 fi
+-fi
+-
+-    if test x$with_mblock = xyes; then
+-        if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component mblock: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_mblock_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    mblock_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    mblock_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$pmt_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$pmt_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component mblock requires guile, which was not found." >&5
+-$as_echo "Component mblock requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
+-        mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files mblock/Makefile mblock/mblock.pc mblock/doc/Makefile mblock/src/Makefile mblock/src/include/Makefile mblock/src/include/mblock/Makefile mblock/src/lib/Makefile mblock/src/scheme/Makefile mblock/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    mblock_with=no
+-    if test $passed = no; then
+-	if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock has errors; stopping." >&5
+-$as_echo "$as_me: error: Component mblock has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component mblock." >&5
+-$as_echo "Not building component mblock." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs mblock"
+-
+-    if test "x${mblock_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${mblock_INCLUDES}"
+-	else
+-	    with_INCLUDES="${mblock_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	mblock_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	mblock_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${mblock_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${mblock_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	mblock_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	mblock_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${mblock_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${mblock_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	mblock_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component mblock will be included from a pre-installed library and includes." >&5
+-$as_echo "Component mblock will be included from a pre-installed library and includes." >&6; }
+-	    mblock_with=yes
+-	else
+-	    mblock_LDFLAG=
+-            if test x$enable_mblock != xno; then
+-
+-	        build_dirs="$build_dirs mblock"
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; building." >&5
+-$as_echo "Component mblock passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; but not building." >&5
+-$as_echo "Component mblock passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs mblock"
+-        mblock_skipped=yes
+-    else
+-        mblock_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-			{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
++{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+ if test "${ac_cv_header_stat_broken+set}" = set; then
+   $as_echo_n "(cached) " >&6
+@@ -34226,6 +33842,92 @@
+ 
+ 
+ 
++    if test x = x; then
++        pc_comp_name="usrp"
++    else
++        pc_comp_name=""
++    fi
++
++
++# Check whether --with-usrp was given.
++if test "${with_usrp+set}" = set; then
++  withval=$with_usrp; if test "x$withval" != "xyes"; then
++		    with_usrp_val=$withval
++		    with_usrp=yes
++		 fi
++fi
++
++    if test x$with_usrp = xyes; then
++        if test x$enable_usrp = xyes; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: Cannot use both --enable and --with" >&5
++$as_echo "$as_me: error: Component usrp: Cannot use both --enable and --with" >&2;}
++   { (exit 1); exit 1; }; }
++        else
++
++        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++            l_PKG_CONFIG_PATH=$with_usrp_val
++    if test "x$l_PKG_CONFIG_PATH" != "x"; then
++        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
++
++                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++    fi
++
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with; check1=yes
++else
++
++        check1=no
++        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
++            if test "x$s_PKG_CONFIG_PATH" != "x"; then
++                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++	        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with
++else
++  passed=no
++fi
++            fi
++        fi
++        if test $passed != with; then
++            { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++fi
++
++                usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
++    usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
++    usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
++
++    if test x$check1 = xyes; then
++        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
++            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++        fi
++    fi
++
++	    :
++        fi
++    fi
++
++
++
++
+     if test $passed != no; then
+         if test $passed = yes; then
+                         if test x$omnithread_skipped = xyes; then
+@@ -45093,6 +44795,14 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++ if test -n "$EXEEXT"; then
++  am__EXEEXT_TRUE=
++  am__EXEEXT_FALSE='#'
++else
++  am__EXEEXT_TRUE='#'
++  am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -46257,22 +45967,6 @@
+     "gnuradio-core/src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/tests/Makefile" ;;
+     "gnuradio-core/src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/utils/Makefile" ;;
+     "run_tests_core") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_core" ;;
+-    "pmt/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/Makefile" ;;
+-    "pmt/pmt.pc") CONFIG_FILES="$CONFIG_FILES pmt/pmt.pc" ;;
+-    "pmt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/doc/Makefile" ;;
+-    "pmt/src/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/Makefile" ;;
+-    "pmt/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/lib/Makefile" ;;
+-    "pmt/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/Makefile" ;;
+-    "pmt/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/gnuradio/Makefile" ;;
+-    "mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/Makefile" ;;
+-    "mblock/mblock.pc") CONFIG_FILES="$CONFIG_FILES mblock/mblock.pc" ;;
+-    "mblock/doc/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/doc/Makefile" ;;
+-    "mblock/src/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/Makefile" ;;
+-    "mblock/src/include/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/Makefile" ;;
+-    "mblock/src/include/mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/mblock/Makefile" ;;
+-    "mblock/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/lib/Makefile" ;;
+-    "mblock/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/Makefile" ;;
+-    "mblock/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/gnuradio/Makefile" ;;
+     "usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/Makefile" ;;
+     "usrp/usrp.pc") CONFIG_FILES="$CONFIG_FILES usrp/usrp.pc" ;;
+     "usrp/usrp.iss") CONFIG_FILES="$CONFIG_FILES usrp/usrp.iss" ;;

Added: trunk/dports/science/gnuradio-trellis/Portfile
===================================================================
--- trunk/dports/science/gnuradio-trellis/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-trellis/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,61 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-trellis
+version			3.2
+maintainers		nomaintainer
+description		Trellis component of GNU Radio.
+long_description Trellis component of GNU Radio: \
+Provides trellis-based encoder and decoding blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-trellis
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-trellis/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-usrp/Portfile
===================================================================
--- trunk/dports/science/gnuradio-usrp/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-usrp/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,65 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-usrp
+version			3.2
+maintainers		nomaintainer
+description		USRP component of GNU Radio.
+long_description USRP component of GNU Radio: \
+Provides USRP input and output blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core \
+				port:usrp
+
+patchfiles		patch-configure.diff
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--with-usrp \
+				--enable-gr-usrp
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-usrp/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-usrp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-usrp/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio-usrp/files/patch-configure.diff	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,1524 @@
+--- configure.orig	2009-05-26 10:48:41.000000000 -0400
++++ configure	2009-05-26 10:49:43.000000000 -0400
+@@ -785,7 +785,9 @@
+ #endif"
+ 
+ enable_option_checking=no
+-ac_subst_vars='LTLIBOBJS
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
+ with_LIBDIRPATH
+ with_SWIGDIRPATH
+ with_PYDIRPATH
+@@ -993,16 +995,6 @@
+ FUSB_TECH_darwin_FALSE
+ FUSB_TECH_darwin_TRUE
+ FUSB_TECH
+-mblock_LDFLAG
+-mblock_LIBDIRPATH
+-mblock_INCLUDEDIR
+-mblock_LA
+-mblock_INCLUDES
+-pmt_LDFLAG
+-pmt_LIBDIRPATH
+-pmt_INCLUDEDIR
+-pmt_LA
+-pmt_INCLUDES
+ gnuradio_core_LDFLAG
+ gnuradio_core_LIBDIRPATH
+ gnuradio_core_INCLUDEDIR
+@@ -1284,11 +1276,8 @@
+ enable_gnuradio_core
+ with_gnuradio_core
+ with_cblas
+-enable_pmt
+-with_pmt
+-enable_mblock
+-with_mblock
+ enable_usrp
++with_usrp
+ with_fusb_tech
+ enable_usrp2
+ enable_gr_usrp
+@@ -2023,8 +2012,6 @@
+   --enable-omnithread     Stop if omnithread fails configuration
+   --enable-gcell          Stop if gcell fails configuration
+   --enable-gnuradio-core  Stop if gnuradio-core fails configuration
+-  --enable-pmt            Stop if pmt fails configuration
+-  --enable-mblock         Stop if mblock fails configuration
+   --enable-usrp           Stop if usrp fails configuration
+   --enable-usrp2          Stop if usrp2 fails configuration
+   --enable-gr-usrp        Stop if gr-usrp fails configuration
+@@ -2107,12 +2094,9 @@
+                           specified) or PKG_CONFIG_PATH (if PATH not
+                           specified); stop if gnuradio-core not found
+   --with-cblas=<lib>      use CBLAS library <lib>
+-  --with-pmt[=PATH]       Use package pmt if installed in PATH (if specified)
++  --with-usrp[=PATH]      Use package usrp if installed in PATH (if specified)
+                           or PKG_CONFIG_PATH (if PATH not specified); stop if
+-                          pmt not found
+-  --with-mblock[=PATH]    Use package mblock if installed in PATH (if
+-                          specified) or PKG_CONFIG_PATH (if PATH not
+-                          specified); stop if mblock not found
++                          usrp not found
+   --with-fusb-tech=OS     Set fast USB technique (default=auto)
+   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
+   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+@@ -2799,7 +2783,7 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-am__api_version='1.10'
++am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -2899,16 +2883,33 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[\\\"\#\$\&\'\`$am_lf]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
++$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++case $srcdir in
++  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
++$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+       # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
++      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    rm -f conftest.file
+    if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2952,7 +2953,14 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+@@ -2962,6 +2970,115 @@
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
++if test x"${install_sh}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++  *)
++    install_sh="\${SHELL} $am_aux_dir/install-sh"
++  esac
++fi
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+@@ -3144,108 +3261,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    STRIP=$ac_ct_STRIP
+-  fi
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -3278,7 +3293,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+-	@echo done
++	@echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -3289,24 +3304,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++  am__include=include
++  am__quote=
++  _am_result=GNU
++  ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
++   case `$am_make -s -f confmf 2> /dev/null` in #(
++   *the\ am__doit\ target*)
++     am__include=.include
++     am__quote="\""
++     _am_result=BSD
++     ;;
++   esac
+ fi
+ 
+ 
+@@ -4295,6 +4310,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -4312,7 +4332,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -4322,19 +4352,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -5716,6 +5750,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -5733,7 +5772,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -5743,19 +5792,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -6400,6 +6453,9 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -6417,7 +6473,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -6427,19 +6493,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -7550,13 +7620,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:7553: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:7623: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7556: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:7626: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7559: output\"" >&5)
++  (eval echo "\"\$as_me:7629: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -8747,7 +8817,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8750 "configure"' > conftest.$ac_ext
++  echo '#line 8820 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -10018,6 +10088,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -10035,7 +10110,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -10045,19 +10130,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -10772,11 +10861,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10779: \$? = $ac_status" >&5
++   echo "$as_me:10868: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11111,11 +11200,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11203: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11118: \$? = $ac_status" >&5
++   echo "$as_me:11207: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11216,11 +11305,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11219: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11308: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11223: \$? = $ac_status" >&5
++   echo "$as_me:11312: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11271,11 +11360,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11274: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11363: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11278: \$? = $ac_status" >&5
++   echo "$as_me:11367: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14084,7 +14173,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14087 "configure"
++#line 14176 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14180,7 +14269,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14183 "configure"
++#line 14272 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16200,11 +16289,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16207: \$? = $ac_status" >&5
++   echo "$as_me:16296: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16299,11 +16388,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16306: \$? = $ac_status" >&5
++   echo "$as_me:16395: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16351,11 +16440,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16354: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16443: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16358: \$? = $ac_status" >&5
++   echo "$as_me:16447: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18354,11 +18443,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18446: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18361: \$? = $ac_status" >&5
++   echo "$as_me:18450: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18453,11 +18542,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18460: \$? = $ac_status" >&5
++   echo "$as_me:18549: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18505,11 +18594,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18508: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18597: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18512: \$? = $ac_status" >&5
++   echo "$as_me:18601: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -20847,7 +20936,7 @@
+ 
+         # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++      for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -20909,7 +20998,7 @@
+ if test "${am_cv_python_version+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20928,7 +21017,7 @@
+ if test "${am_cv_python_platform+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
++  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+ $as_echo "$am_cv_python_platform" >&6; }
+@@ -20944,12 +21033,19 @@
+ else
+   if test "x$prefix" = xNONE
+      then
+-       py_prefix_arg=
++       am_py_prefix=$ac_default_prefix
+      else
+-       py_prefix_arg=",prefix='$prefix'"
++       am_py_prefix=$prefix
+      fi
+-     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pythondir in
++     $am_py_prefix*)
++       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -20967,12 +21063,19 @@
+ else
+   if test "x$exec_prefix" = xNONE
+      then
+-       py_exec_prefix_arg=$py_prefix_arg
++       am_py_exec_prefix=$am_py_prefix
+      else
+-       py_exec_prefix_arg=",prefix='$exec_prefix'"
++       am_py_exec_prefix=$exec_prefix
+      fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pyexecdir in
++     $am_py_exec_prefix*)
++       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -33135,494 +33238,7 @@
+ 
+ 
+ 
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-pmt was given.
+-if test "${enable_pmt+set}" = set; then
+-  enableval=$enable_pmt;
+-else
+-
+-        enable_pmt=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="pmt"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-pmt was given.
+-if test "${with_pmt+set}" = set; then
+-  withval=$with_pmt; if test "x$withval" != "xyes"; then
+-		    with_pmt_val=$withval
+-		    with_pmt=yes
+-		 fi
+-fi
+-
+-    if test x$with_pmt = xyes; then
+-        if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component pmt: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_pmt_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    pmt_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    pmt_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component pmt requires guile, which was not found." >&5
+-$as_echo "Component pmt requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
+-        pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files pmt/Makefile pmt/pmt.pc pmt/doc/Makefile pmt/src/Makefile pmt/src/lib/Makefile pmt/src/scheme/Makefile pmt/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    pmt_with=no
+-    if test $passed = no; then
+-	if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt has errors; stopping." >&5
+-$as_echo "$as_me: error: Component pmt has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component pmt." >&5
+-$as_echo "Not building component pmt." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs pmt"
+-
+-    if test "x${pmt_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${pmt_INCLUDES}"
+-	else
+-	    with_INCLUDES="${pmt_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	pmt_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	pmt_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${pmt_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${pmt_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	pmt_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	pmt_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${pmt_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${pmt_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	pmt_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component pmt will be included from a pre-installed library and includes." >&5
+-$as_echo "Component pmt will be included from a pre-installed library and includes." >&6; }
+-	    pmt_with=yes
+-	else
+-	    pmt_LDFLAG=
+-            if test x$enable_pmt != xno; then
+-
+-	        build_dirs="$build_dirs pmt"
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; building." >&5
+-$as_echo "Component pmt passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; but not building." >&5
+-$as_echo "Component pmt passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs pmt"
+-        pmt_skipped=yes
+-    else
+-        pmt_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-mblock was given.
+-if test "${enable_mblock+set}" = set; then
+-  enableval=$enable_mblock;
+-else
+-
+-        enable_mblock=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="mblock"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-mblock was given.
+-if test "${with_mblock+set}" = set; then
+-  withval=$with_mblock; if test "x$withval" != "xyes"; then
+-		    with_mblock_val=$withval
+-		    with_mblock=yes
+-		 fi
+-fi
+-
+-    if test x$with_mblock = xyes; then
+-        if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component mblock: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_mblock_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    mblock_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    mblock_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$pmt_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$pmt_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component mblock requires guile, which was not found." >&5
+-$as_echo "Component mblock requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
+-        mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files mblock/Makefile mblock/mblock.pc mblock/doc/Makefile mblock/src/Makefile mblock/src/include/Makefile mblock/src/include/mblock/Makefile mblock/src/lib/Makefile mblock/src/scheme/Makefile mblock/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    mblock_with=no
+-    if test $passed = no; then
+-	if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock has errors; stopping." >&5
+-$as_echo "$as_me: error: Component mblock has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component mblock." >&5
+-$as_echo "Not building component mblock." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs mblock"
+-
+-    if test "x${mblock_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${mblock_INCLUDES}"
+-	else
+-	    with_INCLUDES="${mblock_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	mblock_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	mblock_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${mblock_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${mblock_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	mblock_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	mblock_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${mblock_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${mblock_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	mblock_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component mblock will be included from a pre-installed library and includes." >&5
+-$as_echo "Component mblock will be included from a pre-installed library and includes." >&6; }
+-	    mblock_with=yes
+-	else
+-	    mblock_LDFLAG=
+-            if test x$enable_mblock != xno; then
+-
+-	        build_dirs="$build_dirs mblock"
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; building." >&5
+-$as_echo "Component mblock passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; but not building." >&5
+-$as_echo "Component mblock passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs mblock"
+-        mblock_skipped=yes
+-    else
+-        mblock_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-			{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
++{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+ if test "${ac_cv_header_stat_broken+set}" = set; then
+   $as_echo_n "(cached) " >&6
+@@ -34226,6 +33842,92 @@
+ 
+ 
+ 
++    if test x = x; then
++        pc_comp_name="usrp"
++    else
++        pc_comp_name=""
++    fi
++
++
++# Check whether --with-usrp was given.
++if test "${with_usrp+set}" = set; then
++  withval=$with_usrp; if test "x$withval" != "xyes"; then
++		    with_usrp_val=$withval
++		    with_usrp=yes
++		 fi
++fi
++
++    if test x$with_usrp = xyes; then
++        if test x$enable_usrp = xyes; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: Cannot use both --enable and --with" >&5
++$as_echo "$as_me: error: Component usrp: Cannot use both --enable and --with" >&2;}
++   { (exit 1); exit 1; }; }
++        else
++
++        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++            l_PKG_CONFIG_PATH=$with_usrp_val
++    if test "x$l_PKG_CONFIG_PATH" != "x"; then
++        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
++
++                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++    fi
++
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with; check1=yes
++else
++
++        check1=no
++        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
++            if test "x$s_PKG_CONFIG_PATH" != "x"; then
++                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++	        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with
++else
++  passed=no
++fi
++            fi
++        fi
++        if test $passed != with; then
++            { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++fi
++
++                usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
++    usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
++    usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
++
++    if test x$check1 = xyes; then
++        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
++            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++        fi
++    fi
++
++	    :
++        fi
++    fi
++
++
++
++
+     if test $passed != no; then
+         if test $passed = yes; then
+                         if test x$omnithread_skipped = xyes; then
+@@ -45093,6 +44795,14 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++ if test -n "$EXEEXT"; then
++  am__EXEEXT_TRUE=
++  am__EXEEXT_FALSE='#'
++else
++  am__EXEEXT_TRUE='#'
++  am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -46257,22 +45967,6 @@
+     "gnuradio-core/src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/tests/Makefile" ;;
+     "gnuradio-core/src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/utils/Makefile" ;;
+     "run_tests_core") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_core" ;;
+-    "pmt/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/Makefile" ;;
+-    "pmt/pmt.pc") CONFIG_FILES="$CONFIG_FILES pmt/pmt.pc" ;;
+-    "pmt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/doc/Makefile" ;;
+-    "pmt/src/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/Makefile" ;;
+-    "pmt/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/lib/Makefile" ;;
+-    "pmt/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/Makefile" ;;
+-    "pmt/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/gnuradio/Makefile" ;;
+-    "mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/Makefile" ;;
+-    "mblock/mblock.pc") CONFIG_FILES="$CONFIG_FILES mblock/mblock.pc" ;;
+-    "mblock/doc/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/doc/Makefile" ;;
+-    "mblock/src/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/Makefile" ;;
+-    "mblock/src/include/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/Makefile" ;;
+-    "mblock/src/include/mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/mblock/Makefile" ;;
+-    "mblock/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/lib/Makefile" ;;
+-    "mblock/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/Makefile" ;;
+-    "mblock/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/gnuradio/Makefile" ;;
+     "usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/Makefile" ;;
+     "usrp/usrp.pc") CONFIG_FILES="$CONFIG_FILES usrp/usrp.pc" ;;
+     "usrp/usrp.iss") CONFIG_FILES="$CONFIG_FILES usrp/usrp.iss" ;;

Added: trunk/dports/science/gnuradio-utils/Portfile
===================================================================
--- trunk/dports/science/gnuradio-utils/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-utils/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,66 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-utils
+version			3.2
+maintainers		nomaintainer
+description		GR Utils component of GNU Radio.
+long_description GR Utils component of GNU Radio: \
+Python-based scripts for plotting and USRP functions.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-wxgui \
+				port:usrp
+
+patchfiles		patch-configure.diff
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--with-gr-wxgui \
+				--with-usrp \
+				--enable-gr-utils
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-utils/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-utils/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-utils/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio-utils/files/patch-configure.diff	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,1524 @@
+--- configure.orig	2009-05-26 10:48:41.000000000 -0400
++++ configure	2009-05-26 10:49:43.000000000 -0400
+@@ -785,7 +785,9 @@
+ #endif"
+ 
+ enable_option_checking=no
+-ac_subst_vars='LTLIBOBJS
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
+ with_LIBDIRPATH
+ with_SWIGDIRPATH
+ with_PYDIRPATH
+@@ -993,16 +995,6 @@
+ FUSB_TECH_darwin_FALSE
+ FUSB_TECH_darwin_TRUE
+ FUSB_TECH
+-mblock_LDFLAG
+-mblock_LIBDIRPATH
+-mblock_INCLUDEDIR
+-mblock_LA
+-mblock_INCLUDES
+-pmt_LDFLAG
+-pmt_LIBDIRPATH
+-pmt_INCLUDEDIR
+-pmt_LA
+-pmt_INCLUDES
+ gnuradio_core_LDFLAG
+ gnuradio_core_LIBDIRPATH
+ gnuradio_core_INCLUDEDIR
+@@ -1284,11 +1276,8 @@
+ enable_gnuradio_core
+ with_gnuradio_core
+ with_cblas
+-enable_pmt
+-with_pmt
+-enable_mblock
+-with_mblock
+ enable_usrp
++with_usrp
+ with_fusb_tech
+ enable_usrp2
+ enable_gr_usrp
+@@ -2023,8 +2012,6 @@
+   --enable-omnithread     Stop if omnithread fails configuration
+   --enable-gcell          Stop if gcell fails configuration
+   --enable-gnuradio-core  Stop if gnuradio-core fails configuration
+-  --enable-pmt            Stop if pmt fails configuration
+-  --enable-mblock         Stop if mblock fails configuration
+   --enable-usrp           Stop if usrp fails configuration
+   --enable-usrp2          Stop if usrp2 fails configuration
+   --enable-gr-usrp        Stop if gr-usrp fails configuration
+@@ -2107,12 +2094,9 @@
+                           specified) or PKG_CONFIG_PATH (if PATH not
+                           specified); stop if gnuradio-core not found
+   --with-cblas=<lib>      use CBLAS library <lib>
+-  --with-pmt[=PATH]       Use package pmt if installed in PATH (if specified)
++  --with-usrp[=PATH]      Use package usrp if installed in PATH (if specified)
+                           or PKG_CONFIG_PATH (if PATH not specified); stop if
+-                          pmt not found
+-  --with-mblock[=PATH]    Use package mblock if installed in PATH (if
+-                          specified) or PKG_CONFIG_PATH (if PATH not
+-                          specified); stop if mblock not found
++                          usrp not found
+   --with-fusb-tech=OS     Set fast USB technique (default=auto)
+   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
+   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+@@ -2799,7 +2783,7 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-am__api_version='1.10'
++am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -2899,16 +2883,33 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[\\\"\#\$\&\'\`$am_lf]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
++$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++case $srcdir in
++  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
++    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
++$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+       # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
++      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    rm -f conftest.file
+    if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2952,7 +2953,14 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+@@ -2962,6 +2970,115 @@
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
++if test x"${install_sh}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++  *)
++    install_sh="\${SHELL} $am_aux_dir/install-sh"
++  esac
++fi
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+@@ -3144,108 +3261,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    STRIP=$ac_ct_STRIP
+-  fi
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -3278,7 +3293,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+-	@echo done
++	@echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -3289,24 +3304,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++  am__include=include
++  am__quote=
++  _am_result=GNU
++  ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
++   case `$am_make -s -f confmf 2> /dev/null` in #(
++   *the\ am__doit\ target*)
++     am__include=.include
++     am__quote="\""
++     _am_result=BSD
++     ;;
++   esac
+ fi
+ 
+ 
+@@ -4295,6 +4310,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -4312,7 +4332,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -4322,19 +4352,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -5716,6 +5750,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -5733,7 +5772,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -5743,19 +5792,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -6400,6 +6453,9 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -6417,7 +6473,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -6427,19 +6493,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -7550,13 +7620,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:7553: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:7623: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7556: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:7626: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:7559: output\"" >&5)
++  (eval echo "\"\$as_me:7629: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -8747,7 +8817,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8750 "configure"' > conftest.$ac_ext
++  echo '#line 8820 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -10018,6 +10088,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -10035,7 +10110,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
+     case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -10045,19 +10130,23 @@
+ 	break
+       fi
+       ;;
++    msvisualcpp | msvcmsys)
++      # This compiler won't grok `-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -10772,11 +10861,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10864: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10779: \$? = $ac_status" >&5
++   echo "$as_me:10868: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11111,11 +11200,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11203: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11118: \$? = $ac_status" >&5
++   echo "$as_me:11207: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -11216,11 +11305,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11219: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11308: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11223: \$? = $ac_status" >&5
++   echo "$as_me:11312: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11271,11 +11360,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11274: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11363: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11278: \$? = $ac_status" >&5
++   echo "$as_me:11367: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14084,7 +14173,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14087 "configure"
++#line 14176 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14180,7 +14269,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14183 "configure"
++#line 14272 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16200,11 +16289,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16292: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16207: \$? = $ac_status" >&5
++   echo "$as_me:16296: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16299,11 +16388,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16306: \$? = $ac_status" >&5
++   echo "$as_me:16395: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16351,11 +16440,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16354: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16443: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16358: \$? = $ac_status" >&5
++   echo "$as_me:16447: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18354,11 +18443,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18446: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18361: \$? = $ac_status" >&5
++   echo "$as_me:18450: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18453,11 +18542,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18460: \$? = $ac_status" >&5
++   echo "$as_me:18549: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18505,11 +18594,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18508: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18597: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18512: \$? = $ac_status" >&5
++   echo "$as_me:18601: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -20847,7 +20936,7 @@
+ 
+         # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++      for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -20909,7 +20998,7 @@
+ if test "${am_cv_python_version+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20928,7 +21017,7 @@
+ if test "${am_cv_python_platform+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
++  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+ $as_echo "$am_cv_python_platform" >&6; }
+@@ -20944,12 +21033,19 @@
+ else
+   if test "x$prefix" = xNONE
+      then
+-       py_prefix_arg=
++       am_py_prefix=$ac_default_prefix
+      else
+-       py_prefix_arg=",prefix='$prefix'"
++       am_py_prefix=$prefix
+      fi
+-     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pythondir in
++     $am_py_prefix*)
++       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ $as_echo "$am_cv_python_pythondir" >&6; }
+@@ -20967,12 +21063,19 @@
+ else
+   if test "x$exec_prefix" = xNONE
+      then
+-       py_exec_prefix_arg=$py_prefix_arg
++       am_py_exec_prefix=$am_py_prefix
+      else
+-       py_exec_prefix_arg=",prefix='$exec_prefix'"
++       am_py_exec_prefix=$exec_prefix
+      fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+      echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pyexecdir in
++     $am_py_exec_prefix*)
++       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       ;;
++     esac
++
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -33135,494 +33238,7 @@
+ 
+ 
+ 
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-pmt was given.
+-if test "${enable_pmt+set}" = set; then
+-  enableval=$enable_pmt;
+-else
+-
+-        enable_pmt=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="pmt"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-pmt was given.
+-if test "${with_pmt+set}" = set; then
+-  withval=$with_pmt; if test "x$withval" != "xyes"; then
+-		    with_pmt_val=$withval
+-		    with_pmt=yes
+-		 fi
+-fi
+-
+-    if test x$with_pmt = xyes; then
+-        if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component pmt: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_pmt_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    pmt_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    pmt_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component pmt requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component pmt requires guile, which was not found." >&5
+-$as_echo "Component pmt requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
+-        pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files pmt/Makefile pmt/pmt.pc pmt/doc/Makefile pmt/src/Makefile pmt/src/lib/Makefile pmt/src/scheme/Makefile pmt/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    pmt_with=no
+-    if test $passed = no; then
+-	if test x$enable_pmt = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component pmt has errors; stopping." >&5
+-$as_echo "$as_me: error: Component pmt has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component pmt." >&5
+-$as_echo "Not building component pmt." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs pmt"
+-
+-    if test "x${pmt_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${pmt_INCLUDES}"
+-	else
+-	    with_INCLUDES="${pmt_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	pmt_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	pmt_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${pmt_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${pmt_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${pmt_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	pmt_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	pmt_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${pmt_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${pmt_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${pmt_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	pmt_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component pmt will be included from a pre-installed library and includes." >&5
+-$as_echo "Component pmt will be included from a pre-installed library and includes." >&6; }
+-	    pmt_with=yes
+-	else
+-	    pmt_LDFLAG=
+-            if test x$enable_pmt != xno; then
+-
+-	        build_dirs="$build_dirs pmt"
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; building." >&5
+-$as_echo "Component pmt passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component pmt passed configuration checks; but not building." >&5
+-$as_echo "Component pmt passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs pmt"
+-        pmt_skipped=yes
+-    else
+-        pmt_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-    passed=yes
+-    # Check whether --enable-mblock was given.
+-if test "${enable_mblock+set}" = set; then
+-  enableval=$enable_mblock;
+-else
+-
+-        enable_mblock=$enable_all_components
+-        if test x$enable_all_components = xno; then
+-            passed=no
+-        fi
+-
+-fi
+-
+-
+-
+-
+-
+-    if test x = x; then
+-        pc_comp_name="mblock"
+-    else
+-        pc_comp_name=""
+-    fi
+-
+-
+-# Check whether --with-mblock was given.
+-if test "${with_mblock+set}" = set; then
+-  withval=$with_mblock; if test "x$withval" != "xyes"; then
+-		    with_mblock_val=$withval
+-		    with_mblock=yes
+-		 fi
+-fi
+-
+-    if test x$with_mblock = xyes; then
+-        if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: Cannot use both --enable and --with" >&5
+-$as_echo "$as_me: error: Component mblock: Cannot use both --enable and --with" >&2;}
+-   { (exit 1); exit 1; }; }
+-        else
+-
+-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-            l_PKG_CONFIG_PATH=$with_mblock_val
+-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+-
+-                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-    fi
+-
+-        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with; check1=yes
+-else
+-
+-        check1=no
+-        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
+-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-	        if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  passed=with
+-else
+-  passed=no
+-fi
+-            fi
+-        fi
+-        if test $passed != with; then
+-            { { $as_echo "$as_me:$LINENO: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
+-$as_echo "$as_me: error: Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+-
+-fi
+-
+-                mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
+-    mblock_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
+-    mblock_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
+-
+-    if test x$check1 = xyes; then
+-        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
+-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+-        fi
+-    fi
+-
+-	    :
+-        fi
+-    fi
+-
+-
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$pmt_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$pmt_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires pmt to be included as --with-pmt[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-    if test $passed != no; then
+-        if test $passed = yes; then
+-                        if test x$omnithread_skipped = xyes; then
+-                { $as_echo "$as_me:$LINENO: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5
+-$as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; }
+-                passed=no
+-            fi
+-        else
+-                        if test x$omnithread_with = xno; then
+-                { { $as_echo "$as_me:$LINENO: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&5
+-$as_echo "$as_me: error: Component mblock requires omnithread to be included as --with-omnithread[=arg]" >&2;}
+-   { (exit 1); exit 1; }; }
+-            fi
+-        fi
+-    fi
+-
+-
+-                    if test $passed = yes; then
+-
+-    if test x"$GUILE" = x; then
+-        { $as_echo "$as_me:$LINENO: result: Component mblock requires guile, which was not found." >&5
+-$as_echo "Component mblock requires guile, which was not found." >&6; }
+-        passed=no
+-    fi
+-
+-    fi
+-    if test $passed != with; then
+-		mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
+-        mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
+-    fi
+-
+-    ac_config_files="$ac_config_files mblock/Makefile mblock/mblock.pc mblock/doc/Makefile mblock/src/Makefile mblock/src/include/Makefile mblock/src/include/mblock/Makefile mblock/src/lib/Makefile mblock/src/scheme/Makefile mblock/src/scheme/gnuradio/Makefile"
+-
+-
+-
+-
+-    mblock_with=no
+-    if test $passed = no; then
+-	if test x$enable_mblock = xyes; then
+-	    { { $as_echo "$as_me:$LINENO: error: Component mblock has errors; stopping." >&5
+-$as_echo "$as_me: error: Component mblock has errors; stopping." >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-	    { $as_echo "$as_me:$LINENO: result: Not building component mblock." >&5
+-$as_echo "Not building component mblock." >&6; }
+-	fi
+-    else
+-        if test $passed = with; then
+-	    with_dirs="$with_dirs mblock"
+-
+-    if test "x${mblock_INCLUDES}" != "x"; then
+-        if test "x$with_INCLUDES" = "x"; then
+-            with_INCLUDES="${mblock_INCLUDES}"
+-	else
+-	    with_INCLUDES="${mblock_INCLUDES}"" ""$with_INCLUDES"
+-	fi
+-	mblock_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_SWIG_INCLUDES}" != "x"; then
+-        if test "x$with_SWIG_INCLUDES" = "x"; then
+-            with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"
+-	else
+-	    with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES"
+-	fi
+-	mblock_SWIG_INCLUDES=
+-    fi
+-
+-
+-    if test "x${mblock_PYDIRPATH}" != "x"; then
+-        if test "x$with_PYDIRPATH" = "x"; then
+-            with_PYDIRPATH="${mblock_PYDIRPATH}"
+-	else
+-	    with_PYDIRPATH="${mblock_PYDIRPATH}"":""$with_PYDIRPATH"
+-	fi
+-	mblock_PYDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_SWIGDIRPATH}" != "x"; then
+-        if test "x$with_SWIGDIRPATH" = "x"; then
+-            with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"
+-	else
+-	    with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"":""$with_SWIGDIRPATH"
+-	fi
+-	mblock_SWIGDIRPATH=
+-    fi
+-
+-
+-    if test "x${mblock_LIBDIRPATH}" != "x"; then
+-        if test "x$with_LIBDIRPATH" = "x"; then
+-            with_LIBDIRPATH="${mblock_LIBDIRPATH}"
+-	else
+-	    with_LIBDIRPATH="${mblock_LIBDIRPATH}"":""$with_LIBDIRPATH"
+-	fi
+-	mblock_LIBDIRPATH=
+-    fi
+-
+-	    { $as_echo "$as_me:$LINENO: result: Component mblock will be included from a pre-installed library and includes." >&5
+-$as_echo "Component mblock will be included from a pre-installed library and includes." >&6; }
+-	    mblock_with=yes
+-	else
+-	    mblock_LDFLAG=
+-            if test x$enable_mblock != xno; then
+-
+-	        build_dirs="$build_dirs mblock"
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; building." >&5
+-$as_echo "Component mblock passed configuration checks; building." >&6; }
+-            else
+-	        passed=no
+-	        { $as_echo "$as_me:$LINENO: result: Component mblock passed configuration checks; but not building." >&5
+-$as_echo "Component mblock passed configuration checks; but not building." >&6; }
+-	    fi
+-	fi
+-    fi
+-    if test $passed = no; then
+-        skipped_dirs="$skipped_dirs mblock"
+-        mblock_skipped=yes
+-    else
+-        mblock_skipped=no
+-    fi
+-
+-
+-
+-
+-
+-
+-
+-			{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
++{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+ if test "${ac_cv_header_stat_broken+set}" = set; then
+   $as_echo_n "(cached) " >&6
+@@ -34226,6 +33842,92 @@
+ 
+ 
+ 
++    if test x = x; then
++        pc_comp_name="usrp"
++    else
++        pc_comp_name=""
++    fi
++
++
++# Check whether --with-usrp was given.
++if test "${with_usrp+set}" = set; then
++  withval=$with_usrp; if test "x$withval" != "xyes"; then
++		    with_usrp_val=$withval
++		    with_usrp=yes
++		 fi
++fi
++
++    if test x$with_usrp = xyes; then
++        if test x$enable_usrp = xyes; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: Cannot use both --enable and --with" >&5
++$as_echo "$as_me: error: Component usrp: Cannot use both --enable and --with" >&2;}
++   { (exit 1); exit 1; }; }
++        else
++
++        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++            l_PKG_CONFIG_PATH=$with_usrp_val
++    if test "x$l_PKG_CONFIG_PATH" != "x"; then
++        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
++
++                if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then
++	    { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++    fi
++
++        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with; check1=yes
++else
++
++        check1=no
++        				if test "x$l_PKG_CONFIG_PATH" != "x"; then
++            if test "x$s_PKG_CONFIG_PATH" != "x"; then
++                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++	        if test -n "$PKG_CONFIG" && \
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  passed=with
++else
++  passed=no
++fi
++            fi
++        fi
++        if test $passed != with; then
++            { { $as_echo "$as_me:$LINENO: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&5
++$as_echo "$as_me: error: Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." >&2;}
++   { (exit 1); exit 1; }; }
++        fi
++                s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
++
++fi
++
++                usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}`
++    usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}`
++    usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}`
++
++    if test x$check1 = xyes; then
++        	        if test "x$s_PKG_CONFIG_PATH" != "x"; then
++            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
++        fi
++    fi
++
++	    :
++        fi
++    fi
++
++
++
++
+     if test $passed != no; then
+         if test $passed = yes; then
+                         if test x$omnithread_skipped = xyes; then
+@@ -45093,6 +44795,14 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++ if test -n "$EXEEXT"; then
++  am__EXEEXT_TRUE=
++  am__EXEEXT_FALSE='#'
++else
++  am__EXEEXT_TRUE='#'
++  am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -46257,22 +45967,6 @@
+     "gnuradio-core/src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/tests/Makefile" ;;
+     "gnuradio-core/src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/utils/Makefile" ;;
+     "run_tests_core") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_core" ;;
+-    "pmt/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/Makefile" ;;
+-    "pmt/pmt.pc") CONFIG_FILES="$CONFIG_FILES pmt/pmt.pc" ;;
+-    "pmt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/doc/Makefile" ;;
+-    "pmt/src/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/Makefile" ;;
+-    "pmt/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/lib/Makefile" ;;
+-    "pmt/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/Makefile" ;;
+-    "pmt/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/gnuradio/Makefile" ;;
+-    "mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/Makefile" ;;
+-    "mblock/mblock.pc") CONFIG_FILES="$CONFIG_FILES mblock/mblock.pc" ;;
+-    "mblock/doc/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/doc/Makefile" ;;
+-    "mblock/src/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/Makefile" ;;
+-    "mblock/src/include/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/Makefile" ;;
+-    "mblock/src/include/mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/mblock/Makefile" ;;
+-    "mblock/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/lib/Makefile" ;;
+-    "mblock/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/Makefile" ;;
+-    "mblock/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/gnuradio/Makefile" ;;
+     "usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/Makefile" ;;
+     "usrp/usrp.pc") CONFIG_FILES="$CONFIG_FILES usrp/usrp.pc" ;;
+     "usrp/usrp.iss") CONFIG_FILES="$CONFIG_FILES usrp/usrp.iss" ;;

Added: trunk/dports/science/gnuradio-video-sdl/Portfile
===================================================================
--- trunk/dports/science/gnuradio-video-sdl/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-video-sdl/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,62 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-video-sdl
+version			3.2
+maintainers		nomaintainer
+description		Video SDL component of GNU Radio.
+long_description Video SDL of GNU Radio: \
+Provides SDL video source and sink blocks.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core \
+				port:libsdl
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-video-sdl
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-video-sdl/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/gnuradio-wxgui/Portfile
===================================================================
--- trunk/dports/science/gnuradio-wxgui/Portfile	                        (rev 0)
+++ trunk/dports/science/gnuradio-wxgui/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,67 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			gnuradio-wxgui
+version			3.2
+maintainers		nomaintainer
+description		WX GUI component of GNU Radio.
+long_description WX GUI component of GNU Radio: \
+Wx-based GUI widgets, including OpenGL option.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:gnuradio-core
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--with-gruel \
+				--with-gnuradio-core \
+				--enable-gr-wxgui
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25 \
+						port:py25-wxpython \
+						port:py25-numpy \
+						port:py25-opengl
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26 \
+						port:py26-wxpython \
+						port:py26-numpy \
+						port:py26-opengl
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/gnuradio-wxgui/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/usrp/Portfile
===================================================================
--- trunk/dports/science/usrp/Portfile	                        (rev 0)
+++ trunk/dports/science/usrp/Portfile	2009-08-07 20:19:23 UTC (rev 55234)
@@ -0,0 +1,59 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name			usrp
+version			3.2
+maintainers		nomaintainer
+description		USRP user-space driver / interface via USB.
+long_description USRP user-space driver / interface via USB.
+
+categories		science
+homepage		http://gnuradio.org/trac
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir		gnuradio
+master_sites.mirror_subdir gnuradio
+distname		gnuradio-${version}
+master_sites	gnu
+
+platforms		darwin macosx
+
+checksums		md5		9d91d0f8f2cb35bc86435784fa8e72d8 \
+				sha1	3d7e177a57f8c40ec5ac95161f06097872aef1ba \
+				rmd160	9d36dc6427eaf59795c8d4853764d5a526cfbce8
+
+depends_lib		port:libusb \
+				port:sdcc
+
+configure.args	--disable-all-components \
+				--with-omnithread \
+				--enable-usrp
+
+use_parallel_build	yes
+
+variant docs description "build documentation for ${name}" {
+	configure.args-append --enable-doxygen --enable-docs
+	depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+	configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 description "Use Python 2.5" {
+	configure.env PYTHON=${prefix}/bin/python2.5
+	depends_lib-append	port:python25
+}
+
+variant python26 conflicts python25 description "Use Python 2.6" {
+	configure.env PYTHON=${prefix}/bin/python2.6
+	depends_lib-append	port:python26
+}
+
+if { ![variant_isset python25] && ![variant_isset python26] } {
+	default_variants +python26
+}


Property changes on: trunk/dports/science/usrp/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090807/ac9c3308/attachment-0001.html>


More information about the macports-changes mailing list