[Commit-gnuradio] r7856 - in gnuradio/branches/developers/michaelld/bc_behavior: . config

[michaelld]

Author: michaelld
Date: 2008-02-27 08:27:48 -0700 (Wed, 27 Feb 2008)
New Revision: 7856

Modified:
   gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
   gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
   gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
Log:
Fixed --enable behavoir and corrected a dependency check (must happen
one at a time).  Added a comment to configure.ac about the use of
--enable-all-components, as a reminder for anyone working through the
build system.  Changed configure --help comments to read better.



Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4      
2008-02-27 14:23:11 UTC (rev 7855)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4      
2008-02-27 15:27:48 UTC (rev 7856)
@@ -29,10 +29,10 @@
     passed=yes
     AC_ARG_ENABLE([$1],
                  AC_HELP_STRING([--enable-$1],
-                                [Do not build if $1 fails configuration]),
+                                [Stop if $1 fails configuration]),
                  [],[
         [enable_]$2=$enable_all_components
-        if test x$enable_all_components != xyes; then
+        if test x$enable_all_components = xno; then
             passed=no
         fi
     ])
@@ -60,7 +60,7 @@
 AC_DEFUN([_GRC_WITH],[
     AC_ARG_WITH([$1],
                AC_HELP_STRING([--with-$1@<:@=PATH@:>@],
-                              [Use package $1 if installed in PATH (if 
specified) or PKG_CONFIG_PATH (if PATH not specified); error if $1 not found]),
+                              [Use package $1 if installed in PATH (if 
specified) or PKG_CONFIG_PATH (if PATH not specified); stop if $1 not found]),
                 [if test "x$withval" != "xyes"; then
                    [with_]$4[_val]=$withval
                    [with_]$4=yes

Modified: 
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
===================================================================
--- 
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4   
    2008-02-27 14:23:11 UTC (rev 7855)
+++ 
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4   
    2008-02-27 15:27:48 UTC (rev 7856)
@@ -21,7 +21,8 @@
     GRC_ENABLE(gr-audio-osx)
 
     dnl Don't do gr-audio-osx if omnithread or gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-audio-osx, omnithread gnuradio-core)
+    GRC_CHECK_DEPENDENCY(gr-audio-osx, omnithread)
+    GRC_CHECK_DEPENDENCY(gr-audio-osx, gnuradio-core)
 
     dnl If execution gets to here, $passed will be:
     dnl   with : if the --with code didn't error out

Modified: gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/configure.ac     
2008-02-27 14:23:11 UTC (rev 7855)
+++ gnuradio/branches/developers/michaelld/bc_behavior/configure.ac     
2008-02-27 15:27:48 UTC (rev 7856)
@@ -220,9 +220,24 @@
 
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
+dnl For -any- checks on $enable_all_components
+dnl use the following guildlines:
+dnl   yes : --enable-all-components was specified, so error out if any
+dnl         components do not pass configuration checks.
+dnl   no  : --disable-all-components was specified, so try to build the
+dnl         --enable'd components, and error out if any do not pass
+dnl         configuration checks.
+dnl   ""  : this option was not specified on the command line; try to
+dnl         build all components that are not --with'd, but don't
+dnl         error out if any component does not pass configuration checks.
+dnl
+dnl For each --enable-foo component, if that flag is not specified on
+dnl the command line, the related variable $enable_foo will be set to
+dnl $enable_all_components .
+
 AC_ARG_ENABLE(
     [all-components],
-    [  --enable-all-components Build all components or stop on failed 
dependencies]
+    [  --enable-all-components Build all configurable components (default), or 
stop on failed dependencies]
 )
 
 build_dirs="config"