summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.am7
-rw-r--r--config/gr_qwt.m424
-rw-r--r--config/grc_gnuradio_examples.m44
-rw-r--r--config/grc_gr_audio.m4112
-rw-r--r--config/grc_gr_audio_alsa.m449
-rw-r--r--config/grc_gr_audio_jack.m447
-rw-r--r--config/grc_gr_audio_oss.m463
-rw-r--r--config/grc_gr_audio_osx.m453
-rw-r--r--config/grc_gr_audio_portaudio.m447
-rw-r--r--config/grc_gr_audio_windows.m456
-rw-r--r--config/grc_gr_qtgui.m421
-rw-r--r--config/grc_gr_uhd.m43
-rw-r--r--config/grc_gr_usrp.m43
-rw-r--r--config/grc_gr_usrp2.m43
-rw-r--r--config/grc_gr_wxgui.m41
-rw-r--r--config/grc_gruel.m48
16 files changed, 155 insertions, 346 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index 68ff3c78c..535844507 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -51,12 +51,7 @@ m4macros = \
grc_gnuradio_examples.m4 \
grc_grc.m4 \
grc_gr_atsc.m4 \
- grc_gr_audio_alsa.m4 \
- grc_gr_audio_jack.m4 \
- grc_gr_audio_oss.m4 \
- grc_gr_audio_osx.m4 \
- grc_gr_audio_portaudio.m4 \
- grc_gr_audio_windows.m4 \
+ grc_gr_audio.m4 \
grc_gr_comedi.m4 \
grc_gr_gcell.m4 \
grc_gr_gpio.m4 \
diff --git a/config/gr_qwt.m4 b/config/gr_qwt.m4
index 16ec63819..537348ac6 100644
--- a/config/gr_qwt.m4
+++ b/config/gr_qwt.m4
@@ -59,25 +59,25 @@ AC_DEFUN([GR_QWT],
dnl if not set by user
if test "$qwt_incdir" = "" ; then
- dnl check qwt/qwt.h (as in Fedora)
+ dnl check qwt-qt4/qwt.h (as in Ubuntu)
AC_CHECK_HEADER(
- [qwt/qwt.h],
- [qwt_qwt_h=yes],
- [qwt_qwt_h=no]
+ [qwt-qt4/qwt_double_interval.h],
+ [qwt_qt4_qwt_h=yes],
+ [qwt_qt4_qwt_h=no]
)
dnl If it was found, set the flags and move on
- if test "$qwt_qwt_h" = "yes" ; then
- QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt"
+ if test "$qwt_qt4_qwt_h" = "yes" ; then
+ QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4"
else
- dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu)
+ dnl check qwt/qwt.h (as in Fedora)
AC_CHECK_HEADER(
- [qwt-qt4/qwt.h],
- [qwt_qt4_qwt_h=yes],
- [qwt_qt4_qwt_h=no]
+ [qwt/qwt_double_interval.h],
+ [qwt_qwt_h=yes],
+ [qwt_qwt_h=no]
)
dnl if it was found, set the flags and move on
- if test "$qwt_qt4_qwt_h" = "yes" ; then
- QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4"
+ if test "$qwt_qwt_h" = "yes" ; then
+ QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt"
else
dnl otherwise, qwt.h wasn't found, so set the flag to no
libqwt_ok=no
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 0aad0c0da..203f39d0d 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -20,12 +20,14 @@ dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
GRC_ENABLE(gnuradio-examples)
- dnl Do not do gnuradio-examples if gnuradio-core skipped
+ dnl Do not do gnuradio-examples if gnuradio-core or gr-audio skipped
GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core)
+ GRC_CHECK_DEPENDENCY(gnuradio-examples, gr-audio)
AC_CONFIG_FILES([ \
gnuradio-examples/Makefile \
gnuradio-examples/c++/Makefile \
+ gnuradio-examples/c++/audio/Makefile \
gnuradio-examples/python/Makefile \
gnuradio-examples/grc/Makefile \
gnuradio-examples/python/apps/hf_explorer/Makefile \
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
new file mode 100644
index 000000000..bcb19be35
--- /dev/null
+++ b/config/grc_gr_audio.m4
@@ -0,0 +1,112 @@
+dnl Copyright 2011 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GNU Radio
+dnl
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING. If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GR_AUDIO],[
+ GRC_ENABLE(gr-audio)
+
+ GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core)
+
+ ####################################################################
+ ## ALSA Support
+ ####################################################################
+ PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true],
+ [GR_AUDIO_ALSA_SUPPORT=false;AC_MSG_RESULT([gr-audio alsa support requires package alsa, not found.])])
+ AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT)
+
+ ####################################################################
+ ## OSS Support
+ ####################################################################
+ dnl Make sure the correct library and/or headers are available.
+ case $host_os in
+ netbsd*)
+ AC_HAVE_LIBRARY(ossaudio,[GR_AUDIO_OSS_SUPPORT=true],
+ [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires library ossaudio, not found.])])
+ if test $GR_AUDIO_OSS_SUPPORT != false; then
+ OSS_LIBS=-lossaudio
+ AC_SUBST(OSS_LIBS)
+ AC_MSG_RESULT([Using OSS library $OSS_LIBS])
+ fi
+ ;;
+ darwin*)
+ dnl OSX / Darwin can't use OSS
+ GR_AUDIO_OSS_SUPPORT=false
+ ;;
+ *)
+ AC_CHECK_HEADER(sys/soundcard.h,[GR_AUDIO_OSS_SUPPORT=true],
+ [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires sys/soundcard.h, not found.])])
+ esac
+ AM_CONDITIONAL(GR_AUDIO_OSS_SUPPORT, $GR_AUDIO_OSS_SUPPORT)
+
+ ####################################################################
+ ## Jack Support
+ ####################################################################
+ PKG_CHECK_MODULES(JACK, jack >= 0.8, [GR_AUDIO_JACK_SUPPORT=true],
+ [GR_AUDIO_JACK_SUPPORT=false;AC_MSG_RESULT([gr-audio jack support requires package jack, not found.])])
+ AM_CONDITIONAL(GR_AUDIO_JACK_SUPPORT, $GR_AUDIO_JACK_SUPPORT)
+
+ ####################################################################
+ ## OSX Support
+ ####################################################################
+ case "$host_os" in
+ darwin*)
+ MACOSX_AUDIOUNIT([GR_AUDIO_OSX_SUPPORT=true],
+ [GR_AUDIO_OSX_SUPPORT=false;AC_MSG_RESULT([gr-audio osx support requires AudioUnit, not found.])])
+ ;;
+ *)
+ AC_MSG_RESULT([gr-audio osx support will build on Mac OS X and Darwin only.])
+ GR_AUDIO_OSX_SUPPORT=false
+ ;;
+ esac
+ AM_CONDITIONAL(GR_AUDIO_OSX_SUPPORT, $GR_AUDIO_OSX_SUPPORT)
+
+ ####################################################################
+ ## PortAudio Support
+ ####################################################################
+ PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[GR_AUDIO_PORTAUDIO_SUPPORT=true],
+ [GR_AUDIO_PORTAUDIO_SUPPORT=false;AC_MSG_RESULT([gr-audio portaudio support requires package portaudio, not found.])])
+ AM_CONDITIONAL(GR_AUDIO_PORTAUDIO_SUPPORT, $GR_AUDIO_PORTAUDIO_SUPPORT)
+
+ ####################################################################
+ ## Windows Support
+ ####################################################################
+ case "$host_os" in
+ cygwin*|win*|mingw*)
+ AC_HAVE_LIBRARY(winmm, [GR_AUDIO_WINDOWS_SUPPORT=true],
+ [GR_AUDIO_WINDOWS_SUPPORT=false;AC_MSG_RESULT([gr-audio windows support requires library winmm, not found.])])
+ ;;
+ *)
+ AC_MSG_RESULT([gr-audio windows support will build on a Windows Unix environment only.])
+ GR_AUDIO_WINDOWS_SUPPORT=false
+ ;;
+ esac
+ WINAUDIO_LIBS=-lwinmm
+ AC_SUBST(WINAUDIO_LIBS)
+ AM_CONDITIONAL(GR_AUDIO_WINDOWS_SUPPORT, $GR_AUDIO_WINDOWS_SUPPORT)
+
+ AC_CONFIG_FILES([ \
+ gr-audio/Makefile \
+ gr-audio/grc/Makefile \
+ gr-audio/include/Makefile \
+ gr-audio/lib/Makefile \
+ gr-audio/swig/Makefile \
+ gr-audio/gnuradio-audio.pc \
+ ])
+
+ GRC_BUILD_CONDITIONAL(gr-audio)
+])
diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
deleted file mode 100644
index 35389d81d..000000000
--- a/config/grc_gr_audio_alsa.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_AUDIO_ALSA],[
- GRC_ENABLE(gr-audio-alsa)
-
- dnl Don't do gr-audio-alsa if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-audio-alsa, gnuradio-core)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- dnl Don't do gr-audio-alsa if the 'alsa' package is not installed.
- PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],
- [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not found.])])
- fi
-
- AC_CONFIG_FILES([ \
- gr-audio-alsa/Makefile \
- gr-audio-alsa/gnuradio-audio-alsa.pc \
- gr-audio-alsa/src/Makefile \
- gr-audio-alsa/src/run_guile_tests \
- gr-audio-alsa/src/run_tests \
- ])
-
- GRC_BUILD_CONDITIONAL(gr-audio-alsa,[
- dnl run_tests is created from run_tests.in. Make it executable.
- AC_CONFIG_COMMANDS([run_tests_alsa],
- [chmod +x gr-audio-alsa/src/run_tests gr-audio-alsa/src/run_guile_tests])
- ])
-])
diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4
deleted file mode 100644
index d1853588b..000000000
--- a/config/grc_gr_audio_jack.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_AUDIO_JACK],[
- GRC_ENABLE(gr-audio-jack)
-
- dnl Don't do gr-audio-jack if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-audio-jack, gnuradio-core)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- dnl Don't do gr-audio-jack if in 'jack' isn't installed
- PKG_CHECK_MODULES(JACK, jack >= 0.8, [],
- [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not found.])])
- fi
-
- AC_CONFIG_FILES([ \
- gr-audio-jack/Makefile \
- gr-audio-jack/gnuradio-audio-jack.pc \
- gr-audio-jack/src/Makefile \
- gr-audio-jack/src/run_tests \
- ])
-
- GRC_BUILD_CONDITIONAL(gr-audio-jack,[
- dnl run_tests is created from run_tests.in. Make it executable.
- AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x gr-audio-jack/src/run_tests])
- ])
-])
diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4
deleted file mode 100644
index 13c83bba9..000000000
--- a/config/grc_gr_audio_oss.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_AUDIO_OSS],[
- GRC_ENABLE(gr-audio-oss)
-
- dnl Don't do gr-audio-oss if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-audio-oss, gnuradio-core)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- dnl Make sure the correct library and/or headers are available.
- case $host_os in
- netbsd*)
- AC_HAVE_LIBRARY(ossaudio,[],
- [passed=no;AC_MSG_RESULT([gr-audio-oss requires library ossaudio, not found.])])
- if test $passed != no; then
- OSS_LIBS=-lossaudio
- AC_SUBST(OSS_LIBS)
- AC_MSG_RESULT([Using OSS library $OSS_LIBS])
- fi
- ;;
- darwin*)
- dnl OSX / Darwin can't use OSS
- passed=no
- ;;
- *)
- AC_CHECK_HEADER(sys/soundcard.h,[],
- [passed=no;AC_MSG_RESULT([gr-audio-oss requires sys/soundcard.h, not found.])])
- esac
- fi
-
- AC_CONFIG_FILES([ \
- gr-audio-oss/Makefile \
- gr-audio-oss/gnuradio-audio-oss.pc \
- gr-audio-oss/src/Makefile \
- gr-audio-oss/src/run_tests \
- ])
-
- GRC_BUILD_CONDITIONAL(gr-audio-oss,[
- 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])
- ])
-])
diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4
deleted file mode 100644
index df8634ff6..000000000
--- a/config/grc_gr_audio_osx.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_AUDIO_OSX],[
- GRC_ENABLE(gr-audio-osx)
-
- dnl Don't do gr-audio-osx if gnuradio-core skipped
- 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
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- case "$host_os" in
- darwin*)
- MACOSX_AUDIOUNIT([],
- [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not found.])])
- ;;
- *)
- AC_MSG_RESULT([gr-audio-osx will build on Mac OS X and Darwin only.])
- passed=no
- ;;
- esac
- fi
-
- AC_CONFIG_FILES([ \
- gr-audio-osx/Makefile \
- gr-audio-osx/src/Makefile \
- gr-audio-osx/src/run_tests \
- ])
-
- 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])
- ])
-])
diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4
deleted file mode 100644
index ff551b38a..000000000
--- a/config/grc_gr_audio_portaudio.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
- GRC_ENABLE(gr-audio-portaudio)
-
- dnl Don't do gr-audio-portaudio if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-audio-portaudio, gnuradio-core)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- dnl Don't do gr-audio-portaudio if the 'portaudio' library is unavailable.
- PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],
- [passed=no;AC_MSG_RESULT([gr-audio-portaudio requires package portaudio, not found.])])
- fi
-
- AC_CONFIG_FILES([ \
- gr-audio-portaudio/Makefile \
- gr-audio-portaudio/gnuradio-audio-portaudio.pc \
- gr-audio-portaudio/src/Makefile \
- gr-audio-portaudio/src/run_tests \
- ])
-
- GRC_BUILD_CONDITIONAL(gr-audio-portaudio,[
- dnl run_tests is created from run_tests.in. Make it executable.
- AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x gr-audio-portaudio/src/run_tests])
- ])
-])
diff --git a/config/grc_gr_audio_windows.m4 b/config/grc_gr_audio_windows.m4
deleted file mode 100644
index bb6244163..000000000
--- a/config/grc_gr_audio_windows.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[
- GRC_ENABLE(gr-audio-windows)
-
- dnl Don't do gr-audio-windows if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-audio-windows, gnuradio-core)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- case "$host_os" in
- cygwin*|win*|mingw*)
- dnl Don't do gr-audio-windows if the 'winmm' library isn't available.
- AC_HAVE_LIBRARY(winmm, [],
- [passed=no;AC_MSG_RESULT([gr-audio-windows requires library winmm, not found.])])
- ;;
- *)
- AC_MSG_RESULT([gr-audio-windows will build on a Windows Unix environment only.])
- passed=no
- ;;
- esac
- fi
-
- AC_CONFIG_FILES([ \
- gr-audio-windows/Makefile \
- gr-audio-windows/src/Makefile \
- gr-audio-windows/src/run_tests \
- ])
-
- 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_audio_windows], [chmod +x gr-audio-windows/src/run_tests])
- ])
-])
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 4027bb332..aa9646b3c 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2011 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -29,13 +29,12 @@ AC_DEFUN([GRC_GR_QTGUI],[
dnl no : otherwise
PYTHON_CHECK_MODULE([PyQt4.QtCore], [PyQt4 for Qt4], \
- [passed=yes], [passed=no], \
- [PyQt4.QtCore.PYQT_VERSION >= 260000])
+ [], [passed=no], \
+ [PyQt4.QtCore.PYQT_VERSION >= 260000])
- # Enable this if we want to test for PyQwt, too
- #PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \
- # [passed=yes], [passed=no], \
- # [PyQt4.Qwt5.QWT_VERSION >= 327000])
+ PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \
+ [], [passed=no], \
+ [PyQt4.Qwt5.QWT_VERSION >= 327000])
# Check for:
# QtOpenGL
@@ -82,10 +81,16 @@ AC_DEFUN([GRC_GR_QTGUI],[
AC_CONFIG_FILES([ \
gr-qtgui/Makefile \
+ gr-qtgui/grc/Makefile \
gr-qtgui/src/Makefile \
gr-qtgui/src/lib/Makefile \
gr-qtgui/src/python/Makefile \
+ gr-qtgui/src/python/run_tests \
])
- GRC_BUILD_CONDITIONAL(gr-qtgui)
+ GRC_BUILD_CONDITIONAL(gr-qtgui,[
+ dnl run_tests is created from run_tests.in. Make it executable.
+ AC_CONFIG_COMMANDS([run_tests_qtgui],
+ [chmod +x gr-qtgui/src/python/run_tests])
+ ])
])
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index 030b15155..3cc9691e5 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -35,9 +35,10 @@ AC_DEFUN([GRC_GR_UHD],[
# Use this to tell the Makefile whether to define
# GR_HAVE_UHD for swig.
- AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes])
fi
+ AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes])
+
AC_CONFIG_FILES([ \
gr-uhd/Makefile \
gr-uhd/grc/Makefile \
diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4
index b850f0050..c3d2667ca 100644
--- a/config/grc_gr_usrp.m4
+++ b/config/grc_gr_usrp.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2011 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP],[
AC_CONFIG_FILES([ \
gr-usrp/Makefile \
+ gr-usrp/grc/Makefile \
gr-usrp/gnuradio-usrp.pc \
gr-usrp/src/Makefile \
gr-usrp/src/run_tests \
diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
index 5a9bb3b70..3d64db6d6 100644
--- a/config/grc_gr_usrp2.m4
+++ b/config/grc_gr_usrp2.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008,2011 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP2],[
AC_CONFIG_FILES([ \
gr-usrp2/Makefile \
+ gr-usrp2/grc/Makefile \
gr-usrp2/gnuradio-usrp2.pc \
gr-usrp2/src/Makefile \
gr-usrp2/src/run_tests \
diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4
index c443f7c6c..17925fcc5 100644
--- a/config/grc_gr_wxgui.m4
+++ b/config/grc_gr_wxgui.m4
@@ -36,6 +36,7 @@ AC_DEFUN([GRC_GR_WXGUI],[
AC_CONFIG_FILES([ \
gr-wxgui/Makefile \
gr-wxgui/gr-wxgui.pc \
+ gr-wxgui/grc/Makefile \
gr-wxgui/src/Makefile \
gr-wxgui/src/python/Makefile \
gr-wxgui/src/python/plotter/Makefile \
diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4
index 729571434..c3238b39e 100644
--- a/config/grc_gruel.m4
+++ b/config/grc_gruel.m4
@@ -42,12 +42,16 @@ AC_DEFUN([GRC_GRUEL],[
gruel/src/include/gruel/Makefile \
gruel/src/include/gruel/inet.h \
gruel/src/lib/Makefile \
+ gruel/src/swig/Makefile \
+ gruel/src/python/Makefile \
+ gruel/src/python/run_tests \
gruel/src/lib/pmt/Makefile \
gruel/src/lib/msg/Makefile \
gruel/src/scheme/Makefile \
gruel/src/scheme/gnuradio/Makefile \
])
+
dnl Allow creating autoconf independent header files for bytesex routines
AC_CHECK_HEADER(arpa/inet.h, [GR_HAVE_ARPA_INET=1],[GR_HAVE_ARPA_INET=0])
AC_CHECK_HEADER(netinet/in.h, [GR_HAVE_NETINET_IN=1],[GR_HAVE_NETINET_IN=0])
@@ -56,5 +60,7 @@ AC_DEFUN([GRC_GRUEL],[
AC_SUBST(GR_HAVE_NETINET_IN)
AC_SUBST(GR_HAVE_BYTESWAP)
- GRC_BUILD_CONDITIONAL(gruel,[])
+ GRC_BUILD_CONDITIONAL(gruel,[
+ AC_CONFIG_COMMANDS([run_tests_gruel],[chmod +x gruel/src/python/run_tests])
+ ])
])
generated by cgit (git 2.34.1) at 2024-12-22 16:03:34 +0000