[Commit-gnuradio] r3387 - in gnuradio/branches/developers/jcorgan/ticket-28: . config

[jcorgan]

Author: jcorgan
Date: 2006-08-23 21:03:46 -0600 (Wed, 23 Aug 2006)
New Revision: 3387

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_usrp.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for component gr-usrp.

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 02:44:22 UTC (rev 3386)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 03:03:46 UTC (rev 3387)
@@ -32,9 +32,11 @@
 AC_DEFUN([GRC_BUILD_CONDITIONAL],[
     if test x$passed = xno; then
         skipped_dirs="$skipped_dirs $1"
-       if test x$enable_$1 = xyes; then
+       if test x[$enable_]m4_bpatsubst($1,-,_) = xyes; then
            AC_MSG_ERROR([Component $1 has errors, stopping.])
-       fi
+       else
+           AC_MSG_RESULT([Not building component $1.])
+       fi      
     else
         if test x$enable_$1 != xno; then
            $2

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_usrp.m4        
2006-08-24 02:44:22 UTC (rev 3386)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_usrp.m4        
2006-08-24 03:03:46 UTC (rev 3387)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_USRP],[
-    AC_CONFIG_SRCDIR([gr-usrp/src/usrp1.i])
+    GRC_ENABLE([gr-usrp])
 
     AC_CONFIG_FILES([ \
         gr-usrp/Makefile \
@@ -26,21 +26,18 @@
         gr-usrp/src/run_tests \
     ])
 
-    # Don't do gr-usrp if usrp failed
+    # Don't do gr-usrp if usrp skipped
     # There *has* to be a better way to check if a value is in a string
-    succeeded=yes
-    for dir in $failed
+    for dir in $skipped_dirs
     do
-       if test $dir = usrp; then
-           succeeded=no
+       if test x$dir = xusrp; then
+           AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being 
built.])
+           passed=no
        fi
     done
 
-    if test $succeeded = yes; then
+    GRC_BUILD_CONDITIONAL([gr-usrp],[
        dnl run_tests is created from run_tests.in.  Make it executable.
        AC_CONFIG_COMMANDS([run_tests_usrp], [chmod +x gr-usrp/src/run_tests])
-       subdirs="$subdirs gr-usrp"
-    else
-       failed="$failed gr-usrp"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
02:44:22 UTC (rev 3386)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:03:46 UTC (rev 3387)
@@ -159,7 +159,7 @@
 GRC_GNURADIO_CORE
 GRC_GNURADIO_EXAMPLES
 GRC_USRP
-#GRC_GR_USRP                   dnl this must come after GRC_USRP
+GRC_GR_USRP                    dnl this must come after GRC_USRP
 #GRC_GR_AUDIO_ALSA
 #GRC_GR_AUDIO_JACK
 #GRC_GR_AUDIO_OSS