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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 22:35:41 -0600 (Wed, 23 Aug 2006)
New Revision: 3391

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_osx.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/macosx_audiounit.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implemented ticket:28 for gr-audio-osx

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:58:52 UTC (rev 3390)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 04:35:41 UTC (rev 3391)
@@ -32,19 +32,19 @@
 AC_DEFUN([GRC_BUILD_CONDITIONAL],[
     if test x$passed = xno; then
         skipped_dirs="$skipped_dirs $1"
-       if test x[$enable_]m4_bpatsubst($1,-,_) = xyes; then
+       if test x$[enable_]m4_bpatsubst($1,-,_) = xyes; then
            AC_MSG_ERROR([Component $1 has errors, stopping.])
        else
            AC_MSG_RESULT([Not building component $1.])
        fi      
     else
-        if test x$enable_$1 != xno; then
+        if test x$[enable_]m4_bpatsubst($1,-,_) != xno; then
            $2
            build_dirs="$build_dirs $1"
            AC_MSG_RESULT([Component $1 passed configuration checks, building.])
        else
             skipped_dirs="$skipped_dirs $1"
-           AC_MSG_RESULT([Not building component $1.])
+           AC_MSG_RESULT([Component $1 passed configuration checks, but not 
building.])
        fi
     fi
 ])

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_osx.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_osx.m4   
2006-08-24 03:58:52 UTC (rev 3390)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_osx.m4   
2006-08-24 04:35:41 UTC (rev 3391)
@@ -18,21 +18,20 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_OSX],[
-    AC_CONFIG_SRCDIR([gr-audio-osx/src/audio_osx.i])
-
+    GRC_ENABLE([gr-audio-osx])
+    
     AC_CONFIG_FILES([ \
        gr-audio-osx/Makefile \
        gr-audio-osx/src/Makefile \
        gr-audio-osx/src/run_tests \
     ])
     
-    succeeded=yes
-    MACOSX_AUDIOUNIT([],[succeeded=no])
-    if test $succeeded = yes; then
+    passed=yes
+    MACOSX_AUDIOUNIT([],
+        [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not 
found.])])
+
+    GRC_BUILD_CONDITIONAL([gr-audio-osx],[
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_osx], [chmod +x 
gr-audio-osx/src/run_tests])
-        subdirs="$subdirs gr-audio-osx"
-    else
-       failed="$failed gr-audio-osx"
-    fi
+    ])
 ])

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/macosx_audiounit.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/macosx_audiounit.m4   
2006-08-24 03:58:52 UTC (rev 3390)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/macosx_audiounit.m4   
2006-08-24 04:35:41 UTC (rev 3391)
@@ -22,24 +22,14 @@
        darwin*);;
        *) 
           audiounitok=no
-          AC_MSG_WARN([gr-audio-osx requires darwin or MacOS X.])
+          AC_MSG_RESULT([gr-audio-osx requires darwin or MacOS X.])
     esac
 
-    AC_CHECK_HEADERS([AudioUnit/AudioUnit.h],
-         [],
-         [ 
-           audiounitok=no,
-           AC_MSG_WARN([gr-audio-osx requires AudioUnit/AudioUnit.h, which is 
available on MacOS X.])
-         ]
-    )
+    AC_CHECK_HEADERS([AudioUnit/AudioUnit.h],[],
+         [audiounitok=no;AC_MSG_RESULT([gr-audio-osx requires 
AudioUnit/AudioUnit.h, which is available on MacOS X.])])
 
-    AC_CHECK_HEADERS([AudioToolbox/AudioToolbox.h],
-         [],
-         [ 
-           audiounitok=no,
-           AC_MSG_WARN([gr-audio-osx requires AudioToolbox/AudioToolbox.h, 
which is available on MacOS X.])
-         ]
-    )    
+    AC_CHECK_HEADERS([AudioToolbox/AudioToolbox.h],[],
+         [audiounitok=no;AC_MSG_RESULT([gr-audio-osx requires 
AudioToolbox/AudioToolbox.h, which is available on MacOS X.])])    
 
     if test $audiounitok = yes; then
         ifelse([$1], , :, [$1])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:58:52 UTC (rev 3390)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
04:35:41 UTC (rev 3391)
@@ -163,7 +163,7 @@
 GRC_GR_AUDIO_ALSA
 GRC_GR_AUDIO_JACK
 GRC_GR_AUDIO_OSS
-#GRC_GR_AUDIO_OSX
+GRC_GR_AUDIO_OSX
 #GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
 #GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
 #GRC_GR_ATSC