diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | config/grc_usrp.m4 | 12 | ||||
| -rw-r--r-- | usrp/usrp.pc.in | 2 |
3 files changed, 2 insertions, 14 deletions
@@ -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 1bebfc5b9..999b9c5c3 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 2a15a05fd..d4794aa6f 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} |