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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 21:58:52 -0600 (Wed, 23 Aug 2006)
New Revision: 3390

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4
   
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_oss.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_usrp.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_usrp.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for gr-audio-oss and fixes a few implementation bugs for 
the remainder.

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 03:58:52 UTC (rev 3390)
@@ -41,7 +41,10 @@
         if test x$enable_$1 != xno; then
            $2
            build_dirs="$build_dirs $1"
-           AC_MSG_RESULT([Component $1 passed configuration checks.])
+           AC_MSG_RESULT([Component $1 passed configuration checks, building.])
+       else
+            skipped_dirs="$skipped_dirs $1"
+           AC_MSG_RESULT([Not building component $1.])
        fi
     fi
 ])

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4  
2006-08-24 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4  
2006-08-24 03:58:52 UTC (rev 3390)
@@ -53,6 +53,7 @@
         gnuradio-core/src/utils/Makefile \
     ])
     
+    passed=yes
     GRC_BUILD_CONDITIONAL([gnuradio-core],[
         dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_core], [chmod +x 
gnuradio-core/src/python/gnuradio/gr/run_tests])

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4  
    2006-08-24 03:27:59 UTC (rev 3389)
+++ 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4  
    2006-08-24 03:58:52 UTC (rev 3390)
@@ -32,5 +32,6 @@
         gnuradio-examples/python/multi_usrp/Makefile \
     ])
 
+    passed=yes
     GRC_BUILD_CONDITIONAL([gnuradio-examples])
 ])

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4  
2006-08-24 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4  
2006-08-24 03:58:52 UTC (rev 3390)
@@ -26,6 +26,7 @@
        gr-audio-alsa/src/run_tests \
     ])
 
+    passed=yes
     PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],
         [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not 
found.])])
 

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4  
2006-08-24 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4  
2006-08-24 03:58:52 UTC (rev 3390)
@@ -26,6 +26,7 @@
        gr-audio-jack/src/run_tests \
     ])
 
+    passed=yes
     PKG_CHECK_MODULES(JACK, jack >= 0.8,[],
         [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not 
found.])])
 

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_oss.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_oss.m4   
2006-08-24 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_oss.m4   
2006-08-24 03:58:52 UTC (rev 3390)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_OSS],[
-    AC_CONFIG_SRCDIR([gr-audio-oss/src/audio_oss.i])
+    GRC_ENABLE([gr-audio-oss])    
 
     AC_CONFIG_FILES([ \
        gr-audio-oss/Makefile \
@@ -26,27 +26,24 @@
        gr-audio-oss/src/run_tests \
     ])
 
-    succeeded=yes
-
+    passed=yes
     case $target in
        *-*-netbsd*)
-           AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
-           if test $succeeded = yes; then
+           AC_HAVE_LIBRARY(ossaudio,[],
+               [passed=no;AC_MSG_RESULT([gr-audio-oss requires library 
ossaudio, not found.])])
+           if test x$passed != xno; then
                OSS_LIBS=-lossaudio
                AC_MSG_RESULT([Using OSS library $OSS_LIBS])
            fi
            ;;
        *)
-           AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
+           AC_CHECK_HEADER(sys/soundcard.h,[],
+               [passed=no;AC_MSG_RESULT([gr-audio-oss requires 
sys/soundcard.h, not found.])])
     esac
 
-    if test $succeeded = yes; then
+    GRC_BUILD_CONDITIONAL([gr-audio-oss],[
        AC_SUBST(OSS_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_oss], [chmod +x 
gr-audio-oss/src/run_tests])
-        subdirs="$subdirs gr-audio-oss"
-    else
-       AC_MSG_RESULT([failed: $OSS_PKG_ERRORS])
-       failed="$failed gr-audio-oss"
-    fi
+    ])
 ])

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 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_usrp.m4        
2006-08-24 03:58:52 UTC (rev 3390)
@@ -26,6 +26,7 @@
         gr-usrp/src/run_tests \
     ])
 
+    passed=yes
     # Don't do gr-usrp if usrp skipped
     # There *has* to be a better way to check if a value is in a string
     for dir in $skipped_dirs

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_usrp.m4   
2006-08-24 03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_usrp.m4   
2006-08-24 03:58:52 UTC (rev 3390)
@@ -55,6 +55,7 @@
     AC_CHECK_FUNCS([getrusage sched_setscheduler])
     AC_CHECK_FUNCS([sigaction snprintf])
 
+    passed=yes
     USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to configure USB 
dependency.])])
     USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set fast 
USB technique.])])
     USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware 
compiler.])])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:27:59 UTC (rev 3389)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:58:52 UTC (rev 3390)
@@ -162,7 +162,7 @@
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_AUDIO_ALSA
 GRC_GR_AUDIO_JACK
-#GRC_GR_AUDIO_OSS
+GRC_GR_AUDIO_OSS
 #GRC_GR_AUDIO_OSX
 #GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
 #GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***