[Commit-gnuradio] r7499 - in gnuradio/branches/developers/michaelld/t186: config usrp usrp/host/lib/inband

[michaelld]

Author: michaelld
Date: 2008-01-23 09:27:43 -0700 (Wed, 23 Jan 2008)
New Revision: 7499

Modified:
   gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
   gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
   gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in
Log:
Turns out usrp-inband -does- require gnuradio-omnithread, indirectly
via mblock.  Added dependecy check for this, and corrected grc_usrp.m4
config file.



Modified: gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4      
2008-01-23 16:11:26 UTC (rev 7498)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4      
2008-01-23 16:27:43 UTC (rev 7499)
@@ -84,17 +84,13 @@
         AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
         AC_CHECK_FUNCS([sigaction snprintf])
 
-        passed=yes
+       # There are 2 pkg-config files; the one for usrp requires omnithread
+       # for Darwin only.
        case "$host_os" in
            darwin*)
                # for usrp.pc.in
                usrp_darwin_omnithread_pc_requires="gnuradio-omnithread"
                usrp_darwin_omnithread_pc_la="-lgromnithread"
-               # Don't do usrp if omnithread skipped on darwin only
-               if test x$omnithread_skipped = xyes; then
-                   AC_MSG_RESULT([Component usrp requires omnithread when 
running on Darwin (e.g. MacOS X), which is not being built or specified via 
pre-installed files.])
-                   passed=no
-               fi
                ;;
            *)
                # for usrp.pc.in (blanks)
@@ -102,6 +98,12 @@
                usrp_darwin_omnithread_pc_la=""
                ;;
         esac
+        passed=yes
+       # Don't do usrp if omnithread skipped
+       if test x$omnithread_skipped = xyes; then
+            AC_MSG_RESULT([Component usrp requires omnithread, which is not 
being built or specified via pre-installed files.])
+           passed=no
+       fi
        # Don't do usrp if mblock skipped
         if test x$mblock_skipped = xyes; then
             AC_MSG_RESULT([Component usrp requires mblock, which is not being 
built or specified via pre-installed files.])

Modified: 
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am    
    2008-01-23 16:11:26 UTC (rev 7498)
+++ 
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am    
    2008-01-23 16:27:43 UTC (rev 7499)
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.common
 
 INCLUDES =     \
-       $(DEFINES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
+       $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
        $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
        -I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
 
@@ -31,12 +31,10 @@
        usrp_server.mbh                 \
        usrp_interface.mbh 
 
-
 lib_LTLIBRARIES =                      \
        libusrp_inband.la               \
        libusrp_inband-qa.la
 
-
 # ------------------------------------------------------------------------
 # Build the inband library
 
@@ -75,7 +73,7 @@
        usrp_server.h                   \
        usrp_tx.h                       \
        usrp_tx_stub.h                  \
-       usrp_usb_interface.h            
+       usrp_usb_interface.h
 
 noinst_HEADERS =                       \
        fake_usrp.h                     \
@@ -89,16 +87,15 @@
        symbols_usrp_rx_cs.h            \
        symbols_usrp_server_cs.h        \
        symbols_usrp_tx.h               \
-       symbols_usrp_tx_cs.h            
+       symbols_usrp_tx_cs.h
 
-
 # ------------------------------------------------------------------------
 # Build the qa code in its own library
 
 libusrp_inband_qa_la_SOURCES =         \
        qa_inband.cc                    \
        qa_inband_packet_prims.cc       \
-       qa_inband_usrp_server.cc        
+       qa_inband_usrp_server.cc
 
 # magic flags
 libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
@@ -121,6 +118,5 @@
 test_usrp_inband_SOURCES = test_usrp_inband.cc
 test_usrp_inband_LDADD = libusrp_inband-qa.la
 
-
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc

Modified: gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in  
2008-01-23 16:11:26 UTC (rev 7498)
+++ gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in  
2008-01-23 16:27:43 UTC (rev 7499)
@@ -5,7 +5,7 @@
 
 Name: usrp
 Description: USRP C++ Interface with in-band signaling
-Requires: libusb mblock pmt usrp
+Requires: libusb mblock pmt usrp gnuradio-omnithread
 Version: @VERSION@
-Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lpmt -lusb
+Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lpmt -lgromnithread -lusb
 Cflags: -I${includedir} @DEFINES@