[Commit-gnuradio] r7812 - in gnuradio/branches/developers/michaelld/bc_behavior: config gnuradio-core gr-wxgui mblock pmt usrp

[michaelld]

Author: michaelld
Date: 2008-02-24 11:54:36 -0700 (Sun, 24 Feb 2008)
New Revision: 7812

Modified:
   gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
   
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
   gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
   
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
   gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in
   gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in
   gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in
   gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in
   gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in
Log:
Fixes '--with-foo=arg' handling of PKG_CONFIG_PATH internally to the
build system, as well as in the .pc files used by pkg-config.  Allows
for installation of components in any location, indidually or
together.  Corrected a typo in the windows audio m4 script.



Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4      
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4      
2008-02-24 18:54:36 UTC (rev 7812)
@@ -81,20 +81,38 @@
 # $2 is the pkg-config component name
 # $3 is the '_'d component name
 AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
-    if test "x$[with_]$3[_val]" != "x"; then
-        # save PKG_CONFIG_PATH
-        t_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-        export PKG_CONFIG_PATH=$[with_]$3[_val]
+    # save PKG_CONFIG_PATH, restore at the end
+    s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+    # create the PKG_CONFIG_PATH, via this component's arg, if provided
+    # else use the environment's PKG_CONFIG_PATH
+    l_PKG_CONFIG_PATH=$[with_]$3[_val]
+    if test x$l_PKG_CONFIG_PATH != x; then
+        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
     fi
-    PKG_CHECK_EXISTS($2, [],
-                   AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info.]))
+
+    echo
+    echo "Checking for $1 using PKG_CONFIG"
+    echo "Using PKG_CONFIG_PATH = '$PKG_CONFIG_PATH'"
+    echo "Saved PKG_CONFIG_PATH = '$s_PKG_CONFIG_PATH'"
+    echo
+
+    # finally, do the check; error out if not found
+    PKG_CHECK_EXISTS($2, [], AC_MSG_ERROR([Component $1: PKGCONFIG cannot find 
info.]))
+
+    # if PKG_CHECK_EXISTS returned, then this component's .pc file was
+    # found in the provided 'arg' PKG_CONFIG_PATH;
+    # retrieve various parameters
     $3[_INCLUDES]=`$PKG_CONFIG --cflags-only-I $2`
     $3[_LA]=`$PKG_CONFIG --libs $2`
     $3[_INCLUDEDIR]=`$PKG_CONFIG --variable=includedir $2`
     $3[_LIBDIRPATH]=`$PKG_CONFIG --variable=libdir $2`
-    if test "x$[with_]$3[_val]" != "x"; then
-        # restore PKG_CONFIG_PATH
-        export PKG_CONFIG_PATH=$t_PKG_CONFIG_PATH
+
+    # if 'arg' was provided, then it works for (at least) this component;
+    # append the 'arg' to the saved PKG_CONFIG_PATH, and make it global
+    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}
+        fi
     fi
     passed=with
 ])

Modified: 
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
===================================================================
--- 
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
   2008-02-24 18:42:04 UTC (rev 7811)
+++ 
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
   2008-02-24 18:54:36 UTC (rev 7812)
@@ -1,3 +1,4 @@
+ ..
 dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
@@ -37,7 +38,7 @@
               [passed=no;AC_MSG_RESULT([gr-audio-windows requires library 
winmm, not found.])])
           ;;
       *)
-          AC_MSG_RESULT([gr-audio-windows will build on a Windows Unix 
environmet only.])
+          AC_MSG_RESULT([gr-audio-windows will build on a Windows Unix 
environment only.])
           passed=no
           ;;
     esac

Modified: 
gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4 
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4 
2008-02-24 18:54:36 UTC (rev 7812)
@@ -26,7 +26,6 @@
              [cf_with_fusb_tech="$withval"],
              [cf_with_fusb_tech="$host_os"])
 
-  AC_MSG_CHECKING([for fast usb technique to use])
   case "$cf_with_fusb_tech" in
     linux*)
       AC_CHECK_HEADER([linux/usbdevice_fs.h],
@@ -58,6 +57,7 @@
       ;;
   esac
 
+  AC_MSG_CHECKING([for fast usb technique to use])
   AC_MSG_RESULT($FUSB_TECH)
   AC_SUBST(FUSB_TECH)
 

Modified: 
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
===================================================================
--- 
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
        2008-02-24 18:42:04 UTC (rev 7811)
+++ 
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
        2008-02-24 18:54:36 UTC (rev 7812)
@@ -5,7 +5,7 @@
 
 Name: gnuradio-core
 Description: GNU Software Radio toolkit
-Requires: gnuradio-omnithread fftw3f
+Requires:
 Version: @VERSION@
 Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@ -lgromnithread
 Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@

Modified: 
gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in  
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in  
2008-02-24 18:54:36 UTC (rev 7812)
@@ -5,7 +5,7 @@
 
 Name: gr-wxgui
 Description: A simple wx gui for GNU Radio applications
-Requires: gnuradio-core
+Requires:
 Version: @VERSION@
 Libs:
 Cflags:

Modified: gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in      
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in      
2008-02-24 18:54:36 UTC (rev 7812)
@@ -5,7 +5,7 @@
 
 Name: mblock
 Description: The GNU Radio message block library
-Requires: gnuradio-omnithread pmt
+Requires:
 Version: @VERSION@
 Libs: -L${libdir} -lmblock -lgromnithread -lpmt
 Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@

Modified: gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in    
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in    
2008-02-24 18:54:36 UTC (rev 7812)
@@ -5,7 +5,7 @@
 
 Name: pmt
 Description: The GNU Radio Polymorphic Type library
-Requires: gnuradio-omnithread
+Requires:
 Version: @VERSION@
 Libs: -L${libdir} -lpmt -lgromnithread
 Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@

Modified: 
gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in   
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in   
2008-02-24 18:54:36 UTC (rev 7812)
@@ -5,7 +5,7 @@
 
 Name: usrp
 Description: USRP C++ Interface with in-band signaling
-Requires: libusb mblock pmt usrp gnuradio-omnithread
+Requires:
 Version: @VERSION@
 Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lpmt -lgromnithread -lusb
 Cflags: -I${includedir} @DEFINES@

Modified: gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in  
2008-02-24 18:42:04 UTC (rev 7811)
+++ gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in  
2008-02-24 18:54:36 UTC (rev 7812)
@@ -5,7 +5,7 @@
 
 Name: usrp
 Description: USRP Client Side C++ interface
-Requires: libusb @usrp_darwin_omnithread_pc_requires@
+Requires:
 Version: @VERSION@
 Libs: -L${libdir} -lusrp -lusb @usrp_darwin_omnithread_pc_la@
 Cflags: -I${includedir} @DEFINES@