[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3393 - in gnuradio/branches/developers/jcorgan/ticket
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r3393 - in gnuradio/branches/developers/jcorgan/ticket-28: . config |
Date: |
Wed, 23 Aug 2006 22:48:04 -0600 (MDT) |
Author: jcorgan
Date: 2006-08-23 22:48:04 -0600 (Wed, 23 Aug 2006)
New Revision: 3393
Modified:
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_windows.m4
gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for gr-audio-windows.
Modified:
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_windows.m4
===================================================================
---
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_windows.m4
2006-08-24 04:42:32 UTC (rev 3392)
+++
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_windows.m4
2006-08-24 04:48:04 UTC (rev 3393)
@@ -18,7 +18,7 @@
dnl Boston, MA 02111-1307, USA.
AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[
- AC_CONFIG_SRCDIR([gr-audio-windows/src/audio_windows.i])
+ GRC_ENABLE([gr-audio-windows])
AC_CONFIG_FILES([ \
gr-audio-windows/Makefile \
@@ -26,17 +26,14 @@
gr-audio-windows/src/run_tests \
])
- succeeded=yes
- AC_HAVE_LIBRARY(winmm,[],[succeeded=no])
+ passed=yes
+ AC_HAVE_LIBRARY(winmm,[],
+ [passed=no;AC_MSG_RESULT([gr-audio-windows requires library winmm, not
found.])])
- if test $succeeded = yes; then
+ GRC_BUILD_CONDITIONAL([gr-audio-windows],[
WINAUDIO_LIBS=-lwinmm
AC_SUBST(WINAUDIO_LIBS)
-
dnl run_tests is created from run_tests.in. Make it executable.
- AC_CONFIG_COMMANDS([run_tests_windows], [chmod +x
gr-audio-windows/src/run_tests])
- subdirs="$subdirs gr-audio-windows"
- else
- failed="$failed gr-audio-windows"
- fi
+ AC_CONFIG_COMMANDS([run_tests_audio_windows], [chmod +x
gr-audio-windows/src/run_tests])
+ ])
])
Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24
04:42:32 UTC (rev 3392)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24
04:48:04 UTC (rev 3393)
@@ -164,8 +164,8 @@
GRC_GR_AUDIO_JACK
GRC_GR_AUDIO_OSS
GRC_GR_AUDIO_OSX
-GRC_GR_AUDIO_PORTAUDIO dnl ***NOT TESTED***
-#GRC_GR_AUDIO_WINDOWS dnl ***NOT TESTED***
+GRC_GR_AUDIO_PORTAUDIO
+GRC_GR_AUDIO_WINDOWS
#GRC_GR_ATSC
#GRC_GR_COMEDI
#dnl GRC_GR_ERROR_CORRECTING_CODES dnl disabled until fix for ticket:36
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3393 - in gnuradio/branches/developers/jcorgan/ticket-28: . config,
jcorgan <=