From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Mon, 26 Apr 2010 20:04:23 +0000 (-0700)
Subject: Further updates for removing omnithreads
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a40feb1dece1b8064f3f81e669f3ed38b60b6dd8;p=debian%2Fgnuradio

Further updates for removing omnithreads

Updates README
Removes Darwin specific variable in usrp.pc
---

diff --git a/README b/README
index 6eeb0fe8..4656af2c 100644
--- a/README
+++ b/README
@@ -177,7 +177,7 @@ http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103
 
 We use Smart Pointers, the thread library and a bunch of other boost stuff.
 If your system doesn't have boost 1.35 or later, see README.building-boost
-for additional info.
+for additional info.  (Note: Mac OSX systems require 1.37 or later.)
 
 
 (7) cppunit 1.9.14 or later.	http://cppunit.sourceforge.net
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 1bebfc5b..999b9c5c 100644
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -59,18 +59,6 @@ AC_DEFUN([GRC_USRP],[
         usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la"
     fi
 
-    dnl There pkg-config file for usrp requires omnithread for Darwin only.  Create a variable
-    dnl for just the usrp.pc.in case.
-    case "$host_os" in
-      darwin*)
-        usrp_darwin_omnithread_pc_requires="gnuradio-omnithread"
-        ;;
-      *) dnl (blanks)
-        usrp_darwin_omnithread_pc_requires=""
-        ;;
-    esac
-    AC_SUBST(usrp_darwin_omnithread_pc_requires)
-
     AC_CONFIG_FILES([ \
 	usrp/Makefile \
 	usrp/usrp.pc \
diff --git a/usrp/usrp.pc.in b/usrp/usrp.pc.in
index 2a15a05f..d4794aa6 100644
--- a/usrp/usrp.pc.in
+++ b/usrp/usrp.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: usrp
 Description: USRP Client Side C++ interface
-Requires: @LIBUSB_PKG_CONFIG_NAME@ @usrp_darwin_omnithread_pc_requires@
+Requires: @LIBUSB_PKG_CONFIG_NAME@
 Version: @VERSION@
 Libs: -L${libdir} -lusrp
 Cflags: -I${includedir}