[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7773 - gnuradio/branches/developers/michaelld/bc_beha
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r7773 - gnuradio/branches/developers/michaelld/bc_behavior/config |
|
Date: |
Fri, 22 Feb 2008 10:53:47 -0700 (MST) |
Author: michaelld
Date: 2008-02-22 10:53:46 -0700 (Fri, 22 Feb 2008)
New Revision: 7773
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/gr_python.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/gr_subversion.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_examples.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_alsa.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_portaudio.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_comedi.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gpio.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gsm_fr_vocoder.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_pager.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_qtgui.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radio_astronomy.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_sounder.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_trellis.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_usrp.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_utils.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_video_sdl.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
Log:
* Added --with-foo=arg , such that PKG_CONFIG checks just in
PKG_CONFIG_PATH=arg for 'foo' and errors out if not found.
* Changed --with-foo behavior to error out if 'foo' is not found in
the PKG_CONFIG_PATH.
* Moved "WITH" processing into macros; really cleans up the grc_*.m4
files (except grc_build.m4, where all the work is done).
* Cleaned up notation and m4-grammar.
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/gr_python.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/gr_python.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/gr_python.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -123,7 +123,6 @@
;;
esac
- AC_SUBST([PYTHON_LDFLAGS])
-
+ AC_SUBST(PYTHON_LDFLAGS)
fi
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/gr_subversion.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/gr_subversion.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/gr_subversion.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -31,6 +31,6 @@
SVNDATE=`$SVN info . | grep 'Last Changed Date' | cut -f 4-6 -d ' '`
fi
- AC_SUBST([SVNVERSION],[$SVNVERSION])
- AC_SUBST([SVNDATE],[$SVNDATE])
+ AC_SUBST(SVNVERSION)
+ AC_SUBST(SVNDATE)
])
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -19,24 +19,111 @@
# Create --enable-foo argument for named component, create variables as needed
# $1 is component name
-AC_DEFUN([GRC_ENABLE],[
+AC_DEFUN([GRC_ENABLE], [
+ _GRC_ENABLE($1,m4_bpatsubst($1,-,_))
+])
+# $2 is the '_'d component name
+AC_DEFUN([_GRC_ENABLE],[
AC_ARG_ENABLE([$1],
AC_HELP_STRING([--enable-$1],
- [Fail build if $1 fails configuration]),
+ [Do not build if $1 fails configuration]),
[],
- [[enable_]m4_bpatsubst($1,-,_)=$enable_all_components])
+ [[enable_]$2=$enable_all_components])
])
# Create --with-foo argument for named compoment, create variables as needed
# $1 is component name
-AC_DEFUN([GRC_WITH],[
+# $2 is what to do on success
+# $3 is the PKG_CONFIG name; if not given, then $1
+AC_DEFUN([GRC_WITH], [
+ if test "x$3" == "x"; then
+ pc_comp_name="$1"
+ else
+ pc_comp_name="$3"
+ fi
+ _GRC_WITH($1,$2,$3,m4_bpatsubst($1,-,_))
+])
+# $3 is the pkg-config component name
+# $4 is the '_'d component name
+AC_DEFUN([_GRC_WITH],[
AC_ARG_WITH([$1],
- AC_HELP_STRING([--with-$1],
- [Use package $1 if installed in
$prefix/lib/pkgconfig; otherwise revert back to --enable-$1]),
- [],
+ AC_HELP_STRING([--with-$1@<:@=PATH@:>@],
+ [Use package $1 if installed in PATH (if
specified) or PKG_CONFIG_PATH (if PATH not specified); error if $1 not found]),
+ [if test "x$withval" != "xyes"; then
+ [with_]$4[_val]=$withval
+ [with_]$4="yes"
+ fi],
[])
+ passed=no
+ if test x$[with_]$4 = xyes; then
+ if test x$[enable_]$4 = xyes; then
+ AC_MSG_ERROR([Component $1: Cannot use both --enable and --with])
+ else
+ GRC_WITH_PKG_CONFIG_CHECK($1,$3)
+ $2
+ fi
+ fi
])
+# Use 'pkgconfig' to check for a package
+# $1 is the --with component name
+# $2 is the pkg-config component name, if provided; otherwise use $1 for this
+# on success, resulting INCLUDES, INCLUDEDIR, LA, and LIBDIRPATH variables
+# will be set; on failure, will exit with an error.
+AC_DEFUN([GRC_WITH_PKG_CONFIG_CHECK], [
+ if test "x$2" == "x"; then
+ pc_comp_name="$1"
+ else
+ pc_comp_name="$2"
+ fi
+ _GRC_WITH_PKG_CONFIG_CHECK($1,$pc_comp_name,m4_bpatsubst($1,-,_))
+])
+# $2 is the pkg-config component name
+# $3 is the '_'d component name
+AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
+ if test "x$[with_]$3[_val]" != "x"; then
+ # save PKG_CONFIG_PATH
+ t_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ export PKG_CONFIG_PATH=$[with_]$3[_val]
+ fi
+ PKG_CHECK_EXISTS($2, [],
+ AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info.]))
+ $3[_INCLUDES]=`$PKG_CONFIG --cflags-only-I $2`
+ $3[_LA]=`$PKG_CONFIG --libs $2`
+ $3[_INCLUDEDIR]=`$PKG_CONFIG --variable=includedir $2`
+ $3[_LIBDIRPATH]=`$PKG_CONFIG --variable=libdir $2`
+ if test "x$[with_]$3[_val]" != "x"; then
+ # restore PKG_CONFIG_PATH
+ export PKG_CONFIG_PATH=$t_PKG_CONFIG_PATH
+ fi
+ passed=with
+])
+
+# Check list to see if any of the required components were skipped
+# $1 is this component's name
+# $2 is the list of required components
+AC_DEFUN([GRC_CHECK_SKIPPED], [
+ _GRC_CHECK_SKIPPED($1,$2,m4_bpatsubst($1,-,_))])
+# $3 is the '_'d component name
+AC_DEFUN([_GRC_CHECK_SKIPPED],[
+ for tc in $2 ; do
+ if test [x]$3[_skipped] = xyes; then
+ AC_MSG_RESULT([Component $1 requires $tc, which is not being built
or specified via pre-installed files.])
+ passed=no
+ fi
+ done
+])
+
+# Check to make sure GUILE is available
+# $1 is the component name
+AC_DEFUN([GRC_CHECK_GUILE],[
+ AC_PATH_PROG(GUILE,guile)
+ if test "$GUILE" = "" ; then
+ AC_MSG_RESULT([Component $1 requires guile, which was not found.])
+ passed=no
+ fi
+])
+
# Add the specified "with" list; clear the provided variable
# $1 is the component name
# $2 is the path list name suffix
@@ -80,7 +167,7 @@
GRC_ADD_TO_LIST($2, PYDIRPATH, ":")
GRC_ADD_TO_LIST($2, SWIGDIRPATH, ":")
GRC_ADD_TO_LIST($2, LIBDIRPATH, ":")
- AC_MSG_RESULT([Component $1 will be included from a pre-installed
library and includes, and will not be built.])
+ AC_MSG_RESULT([Component $1 will be included from a pre-installed
library and includes.])
else
if test x$enable_$2 != xno; then
$3
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,29 +18,16 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GNURADIO_CORE],[
- GRC_ENABLE([gnuradio-core])
- GRC_WITH([gnuradio-core])
- passed=no
- if test x$with_gnuradio_core = xyes; then
- if test x$enable_gnuradio_core = xyes; then
- AC_MSG_ERROR([Component gnuradio-core: Cannot use both --enable and
--with])
- else
- PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core, passed=with,
- AC_MSG_RESULT([Component gnuradio-core: PKGCONFIG cannot
find info]))
- if test x$passed = xwith; then
- gnuradio_core_INCLUDES=`$PKG_CONFIG --cflags-only-I
gnuradio-core`
- gnuradio_core_LA=$GNURADIO_CORE_LIBS
- gnuradio_core_INCLUDEDIR=`$PKG_CONFIG --variable=includedir
gnuradio-core`
- gnuradio_core_SWIGDIRPATH="$gnuradio_core_INCLUDEDIR/swig"
- gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i"
- gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH"
- gnuradio_core_LIBDIRPATH=`$PKG_CONFIG --variable=libdir
gnuradio-core`
- gnuradio_core_PYDIRPATH=$pythondir
- fi
- fi
- fi
- dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
- dnl otherwise, $passed = no; check the "--enable" stuff
+ GRC_ENABLE(gnuradio-core)
+ GRC_WITH(gnuradio-core, [
+ dnl gnuradio-core has some extra defines if --with specified
+ gnuradio_core_SWIGDIRPATH="$gnuradio_core_INCLUDEDIR/swig"
+ gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i"
+ gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH"
+ gnuradio_core_PYDIRPATH=$pythondir
+ ])
+ dnl if the code gets here, then either $passed = 'with' or 'no'
+ dnl because 'GRC_WITH_PKG_CONFIG_CHECK' will error out if it fails.
if test x$passed = xno; then
AC_CONFIG_FILES([ \
gnuradio-core/Makefile
@@ -75,13 +62,12 @@
gnuradio-core/src/tests/Makefile \
gnuradio-core/src/utils/Makefile \
])
- passed=yes
+ passed=yes
# Don't do gnuradio-core if omnithread skipped
- if test x$omnithread_skipped = xyes; then
- AC_MSG_RESULT([Component gnuradio-core requires omnithread, which
is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gnuradio-core, [omnithread])
+
+ # how and where to find INCLUDES and LA and such
gnuradio_core_INCLUDES="-I\${abs_top_srcdir}/gnuradio-core/src/lib/runtime \
-I\${abs_top_srcdir}/gnuradio-core/src/lib/general \
-I\${abs_top_builddir}/gnuradio-core/src/lib/general \
@@ -101,7 +87,7 @@
gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig"
gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python"
fi
- GRC_BUILD_CONDITIONAL([gnuradio-core],[
+ 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])
@@ -114,10 +100,10 @@
touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d
])
])
- AC_SUBST([gnuradio_core_INCLUDES])
- AC_SUBST([gnuradio_core_LA])
- AC_SUBST([gnuradio_core_I])
- AC_SUBST([gnuradio_core_LIBDIRPATH])
- AC_SUBST([gnuradio_core_SWIGDIRPATH])
- AC_SUBST([gnuradio_core_PYDIRPATH])
+ AC_SUBST(gnuradio_core_INCLUDES)
+ AC_SUBST(gnuradio_core_LA)
+ AC_SUBST(gnuradio_core_I)
+ AC_SUBST(gnuradio_core_LIBDIRPATH)
+ AC_SUBST(gnuradio_core_SWIGDIRPATH)
+ AC_SUBST(gnuradio_core_PYDIRPATH)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_examples.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_examples.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_examples.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
# Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
- GRC_ENABLE([gnuradio-examples])
+ GRC_ENABLE(gnuradio-examples)
AC_CONFIG_FILES([ \
gnuradio-examples/Makefile \
@@ -40,10 +40,7 @@
passed=yes
# Don't do gnuradio-examples if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gnuradio-examples requires gnuradio-core,
which is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gnuradio-examples, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gnuradio-examples])
+ GRC_BUILD_CONDITIONAL(gnuradio-examples)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_ATSC],[
- GRC_ENABLE([gr-atsc])
+ GRC_ENABLE(gr-atsc)
AC_CONFIG_FILES([\
gr-atsc/Makefile \
@@ -31,12 +31,9 @@
passed=yes
# Don't do gr-atsc if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-atsc requires gnuradio-core, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-atsc, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-atsc],[
+ GRC_BUILD_CONDITIONAL(gr-atsc,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_atsc], [chmod +x
gr-atsc/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_alsa.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_alsa.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_alsa.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_ALSA],[
- GRC_ENABLE([gr-audio-alsa])
+ GRC_ENABLE(gr-audio-alsa)
AC_CONFIG_FILES([ \
gr-audio-alsa/Makefile \
@@ -28,15 +28,13 @@
passed=yes
# Don't do gr-audio-alsa if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-osx requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-audio-alsa, [gnuradio-core])
+
# 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.])])
- GRC_BUILD_CONDITIONAL([gr-audio-alsa],[
+ GRC_BUILD_CONDITIONAL(gr-audio-alsa,[
AC_SUBST(ALSA_LIBS)
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])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_JACK],[
- GRC_ENABLE([gr-audio-jack])
+ GRC_ENABLE(gr-audio-jack)
AC_CONFIG_FILES([ \
gr-audio-jack/Makefile \
@@ -28,15 +28,13 @@
passed=yes
# Don't do gr-audio-jack if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-jack requires gnuradio-core, which
is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-audio-jack, [gnuradio-core])
+
# Don't do gr-audio-jack if in 'jack' isn't installed
- PKG_CHECK_MODULES(JACK, jack >= 0.8,[],
+ PKG_CHECK_MODULES(JACK, jack >= 0.8, [],
[passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not
found.])])
- GRC_BUILD_CONDITIONAL([gr-audio-jack],[
+ GRC_BUILD_CONDITIONAL(gr-audio-jack,[
AC_SUBST(JACK_LIBS)
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])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_OSS],[
- GRC_ENABLE([gr-audio-oss])
+ GRC_ENABLE(gr-audio-oss)
AC_CONFIG_FILES([ \
gr-audio-oss/Makefile \
@@ -28,13 +28,11 @@
passed=yes
# Don't do gr-audio-oss if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-oss requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-audio-oss, [gnuradio-core])
+
# Make sure the correct library and/or headers are available.
- case $host in
- *-*-netbsd*)
+ case $host_os in
+ netbsd*)
AC_HAVE_LIBRARY(ossaudio,[],
[passed=no;AC_MSG_RESULT([gr-audio-oss requires library
ossaudio, not found.])])
if test x$passed != xno; then
@@ -42,12 +40,15 @@
AC_MSG_RESULT([Using OSS library $OSS_LIBS])
fi
;;
+ darwin*)
+ passed=no
+ ;;
*)
AC_CHECK_HEADER(sys/soundcard.h,[],
[passed=no;AC_MSG_RESULT([gr-audio-oss requires
sys/soundcard.h, not found.])])
esac
- GRC_BUILD_CONDITIONAL([gr-audio-oss],[
+ 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])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_OSX],[
- GRC_ENABLE([gr-audio-osx])
+ GRC_ENABLE(gr-audio-osx)
AC_CONFIG_FILES([ \
gr-audio-osx/Makefile \
@@ -27,21 +27,21 @@
])
passed=yes
- MACOSX_AUDIOUNIT([],
- [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not
found.])])
+ # Don't do gr-audio-osx if omnithread or gnuradio-core skipped
+ GRC_CHECK_SKIPPED(gr-audio-osx, [omnithread gnuradio-core])
- # Don't do gr-audio-osx if omnithread skipped
- if test x$omnithread_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-osx requires omnithread, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
- # Don't do gr-audio-osx if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-osx requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ 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
- GRC_BUILD_CONDITIONAL([gr-audio-osx],[
+ 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])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_portaudio.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_portaudio.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_portaudio.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
- GRC_ENABLE([gr-audio-portaudio])
+ GRC_ENABLE(gr-audio-portaudio)
AC_CONFIG_FILES([ \
gr-audio-portaudio/Makefile \
@@ -28,15 +28,13 @@
passed=yes
# Don't do gr-audio-portaudio if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-portaudio requires gnuradio-core,
which is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-audio-portaudio, [gnuradio-core])
+
# 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.])])
- GRC_BUILD_CONDITIONAL([gr-audio-portaudio],[
+ GRC_BUILD_CONDITIONAL(gr-audio-portaudio,[
AC_SUBST(PORTAUDIO_LIBS)
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])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[
- GRC_ENABLE([gr-audio-windows])
+ GRC_ENABLE(gr-audio-windows)
AC_CONFIG_FILES([ \
gr-audio-windows/Makefile \
@@ -28,16 +28,21 @@
passed=yes
# Don't do gr-audio-windows if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-audio-windows requires gnuradio-core,
which is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-audio-windows, [gnuradio-core])
- # 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.])])
+ case "$host_os" in
+ cygwin*|win*|mingw*)
+ # 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
environmet only.])
+ passed=no
+ ;;
+ esac
- GRC_BUILD_CONDITIONAL([gr-audio-windows],[
+ 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.
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_comedi.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_comedi.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_COMEDI],[
- GRC_ENABLE([gr-comedi])
+ GRC_ENABLE(gr-comedi)
AC_CONFIG_FILES([ \
gr-comedi/Makefile \
@@ -28,15 +28,13 @@
passed=yes
# Don't do gr-comedi if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-comedi requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-comedi, [gnuradio-core])
+
# Don't do gr-comedi if the 'comedi' library is unavailable.
PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],
[passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
- GRC_BUILD_CONDITIONAL([gr-comedi],[
+ GRC_BUILD_CONDITIONAL(gr-comedi,[
AC_SUBST(COMEDI_LIBS)
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_comedi], [chmod +x
gr-comedi/src/run_tests])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_CVSD_VOCODER],[
- GRC_ENABLE([gr-cvsd-vocoder])
+ GRC_ENABLE(gr-cvsd-vocoder)
AC_CONFIG_FILES([\
gr-cvsd-vocoder/Makefile \
@@ -30,12 +30,9 @@
passed=yes
# Don't do gr-cvsd-vocoder if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-cvsd-vocoder requires gnuradio-core, which
is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-cvsd-vocoder, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-cvsd-vocoder],[
+ GRC_BUILD_CONDITIONAL(gr-cvsd-vocoder,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_cvsd], [chmod +x
gr-cvsd-vocoder/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gpio.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gpio.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gpio.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_GPIO],[
- GRC_ENABLE([gr-gpio])
+ GRC_ENABLE(gr-gpio)
AC_CONFIG_FILES([ \
gr-gpio/Makefile \
@@ -34,15 +34,9 @@
passed=yes
# Don't do gr-gpio if usrp skipped
- for dir in $skipped_dirs
- do
- if test x$dir = xusrp; then
- AC_MSG_RESULT([Component gr-gpio requires usrp, which is not being
built.])
- passed=no
- fi
- done
+ GRC_CHECK_SKIPPED(gr-gpio, [usrp])
- GRC_BUILD_CONDITIONAL([gr-gpio],[
+ GRC_BUILD_CONDITIONAL(gr-gpio,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_gpio], [chmod +x
gr-gpio/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gsm_fr_vocoder.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gsm_fr_vocoder.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gsm_fr_vocoder.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[
- GRC_ENABLE([gr-gsm-fr-vocoder])
+ GRC_ENABLE(gr-gsm-fr-vocoder)
AC_CONFIG_FILES([\
gr-gsm-fr-vocoder/Makefile \
@@ -31,12 +31,9 @@
passed=yes
# Don't do gr-gsm-fr-vocoder if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-gsm-fr-vocoder requires gnuradio-core,
which is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-gsm-fr-vocoder, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-gsm-fr-vocoder],[
+ GRC_BUILD_CONDITIONAL(gr-gsm-fr-vocoder,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_gsm], [chmod +x
gr-gsm-fr-vocoder/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_pager.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_pager.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_pager.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_PAGER],[
- GRC_ENABLE([gr-pager])
+ GRC_ENABLE(gr-pager)
AC_CONFIG_FILES([\
gr-pager/Makefile \
@@ -28,12 +28,9 @@
passed=yes
# Don't do gr-pager if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-pager requires gnuradio-core, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-pager, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-pager],[
+ GRC_BUILD_CONDITIONAL(gr-pager,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x
gr-pager/src/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_qtgui.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_qtgui.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_QTGUI],[
- GRC_ENABLE([gr-qtgui])
+ GRC_ENABLE(gr-qtgui)
AC_CONFIG_FILES([ \
gr-qtgui/Makefile \
@@ -28,23 +28,18 @@
passed=yes
# Don't do gr-qtgui if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-qtgui requires gnuradio-core, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-qtgui, [gnuradio-core])
# Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
- PKG_CHECK_MODULES(QT, qt >= 3.3,[],
- [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, libqt not
found. Checking for libqt-mt])])
-
+ PKG_CHECK_MODULES(QT, qt >= 3.3, [], passed=no)])
if test x$passed == xno; then
passed=yes
- PKG_CHECK_MODULES(QT, qt-mt >= 3.3,[],
- [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, neither
found.])])
+ PKG_CHECK_MODULES(QT, qt-mt >= 3.3, [],
+ [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt,
neither found.])])
fi
# Fetch QWT variables
GR_QWT([], [passed=no])
- GRC_BUILD_CONDITIONAL([gr-qtgui],[])
+ GRC_BUILD_CONDITIONAL(gr-qtgui)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_RADAR_MONO],[
- GRC_ENABLE([gr-radar-mono])
+ GRC_ENABLE(gr-radar-mono)
AC_CONFIG_FILES([ \
gr-radar-mono/Makefile \
@@ -35,17 +35,11 @@
])
passed=yes
+
# Don't do gr-radar-mono if usrp or gnuradio-core skipped
- if test x$usrp_skipped = xyes; then
- AC_MSG_RESULT([Component gr-radar-mono requires usrp, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-radar-mono requires gnuradio-core, which
is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-radar-mono, [usrp gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-radar-mono],[
+ GRC_BUILD_CONDITIONAL(gr-radar-mono,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_radar_mono], [chmod +x
gr-radar-mono/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radio_astronomy.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radio_astronomy.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radio_astronomy.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_RADIO_ASTRONOMY],[
- GRC_ENABLE([gr-radio-astronomy])
+ GRC_ENABLE(gr-radio-astronomy)
AC_CONFIG_FILES([\
gr-radio-astronomy/Makefile \
@@ -30,12 +30,9 @@
passed=yes
# Don't do gr-radio-astronomy if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-radio-astronomy requires gnuradio-core,
which is not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-radio-astronomy, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-radio-astronomy],[
+ GRC_BUILD_CONDITIONAL(gr-radio-astronomy,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_astronomy], [chmod +x
gr-radio-astronomy/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_sounder.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_sounder.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_sounder.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_SOUNDER],[
- GRC_ENABLE([gr-sounder])
+ GRC_ENABLE(gr-sounder)
AC_CONFIG_FILES([ \
gr-sounder/Makefile \
@@ -35,16 +35,9 @@
passed=yes
# Don't do gr-sounder if usrp or gnuradio-core skipped
- if test x$usrp_skipped = xyes; then
- AC_MSG_RESULT([Component gr-sounder requires usrp, which is not being
built or specified via pre-installed files.])
- passed=no
- fi
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-sounder requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-sounder, [usrp gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-sounder],[
+ GRC_BUILD_CONDITIONAL(gr-sounder,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_sounder], [chmod +x
gr-sounder/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_trellis.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_trellis.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_TRELLIS],[
- GRC_ENABLE([gr-trellis])
+ GRC_ENABLE(gr-trellis)
AC_CONFIG_FILES([\
gr-trellis/Makefile \
@@ -33,12 +33,9 @@
passed=yes
# Don't do gr-trellis if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-trellis requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-trellis, [gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-trellis],[
+ GRC_BUILD_CONDITIONAL(gr-trellis,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x
gr-trellis/src/python/run_tests])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_usrp.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_usrp.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_USRP],[
- GRC_ENABLE([gr-usrp])
+ GRC_ENABLE(gr-usrp)
AC_CONFIG_FILES([ \
gr-usrp/Makefile \
@@ -28,16 +28,9 @@
passed=yes
# Don't do gr-usrp if usrp or gnuradio-core skipped
- if test x$usrp_skipped = xyes; then
- AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being
built or specified via pre-installed files.])
- passed=no
- fi
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-usrp requires gnuradio-core, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-usrp, [usrp gnuradio-core])
- GRC_BUILD_CONDITIONAL([gr-usrp],[
+ 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])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_utils.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_utils.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_utils.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,7 +18,7 @@
# Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_UTILS],[
- GRC_ENABLE([gr-utils])
+ GRC_ENABLE(gr-utils)
AC_CONFIG_FILES([ \
gr-utils/Makefile \
@@ -29,18 +29,7 @@
passed=yes
# Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
- if test x$usrp_skipped = xyes; then
- AC_MSG_RESULT([Component gr-utils requires usrp, which is not being
built or specified via pre-installed files.])
- passed=no
- fi
- if test x$gr_wxgui_skipped = xyes; then
- AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-utils, [gnuradio-core usrp gr-wxgui])
- GRC_BUILD_CONDITIONAL([gr-utils])
+ GRC_BUILD_CONDITIONAL(gr-utils)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_video_sdl.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_video_sdl.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_video_sdl.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -28,16 +28,14 @@
passed=yes
# Don't do gr-video-sdl if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-video-sdl requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-video-sdl, [gnuradio-core])
+
# Don't do gr-video-sdl if the SDL library is unavailable.
SDL_VERSION=1.2.0
AM_PATH_SDL($SDL_VERSION,[],
[passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found
or failed test.])])
- GRC_BUILD_CONDITIONAL([gr-video-sdl],[
+ GRC_BUILD_CONDITIONAL(gr-video-sdl,[
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
dnl run_tests is created from run_tests.in. Make it executable.
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,19 +18,10 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_WXGUI],[
- GRC_ENABLE([gr-wxgui])
- GRC_WITH([gr-wxgui])
- passed=no
- if test x$with_gr_wxgui = xyes; then
- if test x$enable_gr_wxgui = xyes; then
- AC_MSG_ERROR([Component gr-wxgui: Cannot use both --enable and
--with])
- else
- PKG_CHECK_MODULES(GR_WXGUI, gr-wxgui, passed=with,
- AC_MSG_RESULT([Component gr-wxgui: PKGCONFIG cannot find
info]))
- fi
- fi
- dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
- dnl otherwise, $passed = no; check the "--enable" stuff
+ GRC_ENABLE(gr-wxgui)
+ GRC_WITH(gr-wxgui)
+ dnl if the code gets here, then either $passed = 'with' or 'no'
+ dnl because 'GRC_WITH_PKG_CONFIG_CHECK' will error out if it fails.
if test x$passed = xno; then
AC_CONFIG_FILES([ \
gr-wxgui/Makefile \
@@ -41,14 +32,13 @@
passed=yes
# Don't do gr-wxgui if gnuradio-core skipped
- if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-wxgui requires gnuradio-core, which is
not being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(gr-wxgui, [gnuradio-core])
+
# Don't do gr-wxgui if wxPython is not available
if ! ${PYTHON} -c 'import wx'; then
passed=no
fi
fi
- GRC_BUILD_CONDITIONAL([gr-wxgui])
+
+ GRC_BUILD_CONDITIONAL(gr-wxgui)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,23 +18,10 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_MBLOCK],[
- GRC_ENABLE([mblock])
- GRC_WITH([mblock])
- passed=no
- if test x$with_mblock = xyes; then
- if test x$enable_mblock = xyes; then
- AC_MSG_ERROR([Component mblock: Cannot use both --enable and
--with])
- else
- PKG_CHECK_MODULES(MBLOCK, mblock, passed=with,
- AC_MSG_RESULT([Component mblock: PKGCONFIG cannot find
info]))
- if test x$passed = xwith; then
- mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I mblock`
- mblock_LA=$MBLOCK_LIBS
- fi
- fi
- fi
- dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
- dnl otherwise, $passed = no; check the "--enable" stuff
+ GRC_ENABLE(mblock)
+ GRC_WITH(mblock)
+ dnl if the code gets here, then either $passed = 'with' or 'no'
+ dnl because 'GRC_WITH_PKG_CONFIG_CHECK' will error out if it fails.
if test x$passed = xno; then
AC_CONFIG_FILES([\
mblock/Makefile \
@@ -47,29 +34,21 @@
])
passed=yes
# Don't do mblock if omnithread or pmt skipped
- if test x$omnithread_skipped = xyes; then
- AC_MSG_RESULT([Component mblock requires omnithread, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
- if test x$pmt_skipped = xyes; then
- AC_MSG_RESULT([Component mblock requires pmt, which is not being
built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(mblock, [omnithread pmt])
+
# Don't do mblock if guile not available
- AC_PATH_PROG(GUILE,guile)
- if test "$GUILE" = "" ; then
- AC_MSG_RESULT([Component mblock requires guile, which was not
found.])
- passed=no
- fi
+ GRC_CHECK_GUILE(mblock)
+
+ # how and where to find INCLUDES and LA
mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/lib"
mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
fi
- GRC_BUILD_CONDITIONAL([mblock],[
+ GRC_BUILD_CONDITIONAL(mblock,[
dnl run_tests is created from run_tests.in. Make it executable.
dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x
mblock/src/python/run_tests])
])
- AC_SUBST([mblock_INCLUDES], [$mblock_INCLUDES])
- AC_SUBST([mblock_LA], [$mblock_LA])
+ AC_SUBST(mblock_INCLUDES)
+ AC_SUBST(mblock_LA)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,39 +18,29 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_OMNITHREAD],[
- GRC_ENABLE([omnithread])
- GRC_WITH([omnithread])
- passed=no
- if test x$with_omnithread = xyes; then
- if test x$enable_omnithread = xyes; then
- AC_MSG_ERROR([Component omnithread: Cannot use both --enable and
--with])
- else
- PKG_CHECK_MODULES(OMNITHREAD, gnuradio-omnithread, passed=with,
- AC_MSG_RESULT([Component omnithread: PKGCONFIG cannot find
info]))
- if test x$passed = xwith; then
- omnithread_INCLUDES=`$PKG_CONFIG --cflags-only-I
gnuradio-omnithread`
- omnithread_LA=$OMNITHREAD_LIBS
- omnithread_LIBDIRPATH=`$PKG_CONFIG --variable=libdir
gnuradio-omnithread`
- fi
- fi
- fi
- dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
- dnl otherwise, $passed = no; check the "--enable" stuff
+ GRC_ENABLE(omnithread)
+ GRC_WITH(omnithread, [], gnuradio-omnithread)
+ dnl if the code gets here, then either $passed = 'with' or 'no'
+ dnl because 'GRC_WITH_PKG_CONFIG_CHECK' will error out if it fails.
if test x$passed = xno; then
AC_CONFIG_FILES([ \
omnithread/Makefile \
omnithread/gnuradio-omnithread.pc
])
passed=yes
+
+ # how and where to find INCLUDES and LA and such
omnithread_INCLUDES="-I\${abs_top_srcdir}/omnithread"
omnithread_LA="\${abs_top_builddir}/omnithread/libgromnithread.la"
omnithread_LIBDIRPATH="\${abs_top_builddir}/omnithread:\${abs_top_builddir}/omnithread/.libs"
fi
- GRC_BUILD_CONDITIONAL([omnithread],[
+
+ GRC_BUILD_CONDITIONAL(omnithread,[
dnl run_tests is created from run_tests.in. Make it executable.
dnl AC_CONFIG_COMMANDS([run_tests_omnithread], [chmod +x
omnithread/run_tests])
])
- AC_SUBST([omnithread_INCLUDES])
- AC_SUBST([omnithread_LA])
- AC_SUBST([omnithread_LIBDIRPATH])
+
+ AC_SUBST(omnithread_INCLUDES)
+ AC_SUBST(omnithread_LA)
+ AC_SUBST(omnithread_LIBDIRPATH)
])
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,23 +18,10 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_PMT],[
- GRC_ENABLE([pmt])
- GRC_WITH([pmt])
- passed=no
- if test x$with_pmt = xyes; then
- if test x$enable_pmt = xyes; then
- AC_MSG_ERROR([Component pmt: Cannot use both --enable and --with])
- else
- PKG_CHECK_MODULES(PMT, pmt, passed=with,
- AC_MSG_RESULT([Component pmt: PKGCONFIG cannot find info]))
- if test x$passed = xwith; then
- pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I pmt`
- pmt_LA=$PMT_LIBS
- fi
- fi
- fi
- dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
- dnl otherwise, $passed = no; check the "--enable" stuff
+ GRC_ENABLE(pmt)
+ GRC_WITH(pmt)
+ dnl if the code gets here, then either $passed = 'with' or 'no'
+ dnl because 'GRC_WITH_PKG_CONFIG_CHECK' will error out if it fails.
if test x$passed = xno; then
AC_CONFIG_FILES([\
pmt/Makefile \
@@ -47,25 +34,21 @@
])
passed=yes
# Don't do pmt if omnithread skipped
- if test x$omnithread_skipped = xyes; then
- AC_MSG_RESULT([Component pmt requires omnithread, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(pmt, [omnithread])
+
# Don't do pmt if guile not available
- AC_PATH_PROG(GUILE,guile)
- if test "$GUILE" = "" ; then
- AC_MSG_RESULT([Component pmt requires guile, which was not found.])
- passed=no
- fi
+ GRC_CHECK_GUILE(pmt)
+
+ # how and where to find INCLUDES and LA
pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
fi
- GRC_BUILD_CONDITIONAL([pmt],[
+ GRC_BUILD_CONDITIONAL(pmt,[
dnl run_tests is created from run_tests.in. Make it executable.
dnl AC_CONFIG_COMMANDS([run_tests_pmt], [chmod +x
pmt/src/python/run_tests])
])
- AC_SUBST([pmt_INCLUDES], [$pmt_INCLUDES])
- AC_SUBST([pmt_LA], [$pmt_LA])
+ AC_SUBST(pmt_INCLUDES)
+ AC_SUBST(pmt_LA)
])
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -18,34 +18,16 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_USRP],[
- GRC_ENABLE([usrp])
- GRC_WITH([usrp])
- passed=no
- if test x$with_usrp = xyes; then
- if test x$enable_usrp = xyes; then
- AC_MSG_ERROR([Component usrp: Cannot use both --enable and --with])
- else
- # the following is required, for whatever reason; ignore the output
- USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set
fast USB technique.])])
- passed=no
- # on to the regular routine
- PKG_CHECK_MODULES(USRP, usrp, passed=with,
- AC_MSG_RESULT([Component usrp: PKGCONFIG cannot find info]))
- if test x$passed = xwith; then
- usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I usrp`
- usrp_LA=$USRP_LIBS
- passed=no
- PKG_CHECK_MODULES(USRP_INBAND, usrp-inband, passed=with,
- AC_MSG_RESULT([Component usrp-inband: PKGCONFIG cannot find
info]))
- if test x$passed = xwith; then
- usrp_inband_INCLUDES=`$PKG_CONFIG --cflags-only-I
usrp-inband`
- usrp_inband_LA=$USRP_INBAND_LIBS
- fi
- fi
- fi
- fi
- dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
- dnl otherwise, $passed = no; check the "--enable" stuff
+ GRC_ENABLE(usrp)
+ # Make sure the fast usb technique is set, OS dependent.
+ USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set fast
USB technique.])])
+ GRC_WITH(usrp, [
+ dnl usrp has some extra defines if --with specified
+ dnl will error out if failure, so no need to check if passed
+ GRC_WITH_PKG_CONFIG_CHECK(usrp-inband)
+ ])
+ dnl if the code gets here, then either $passed = 'with' or 'no'
+ dnl because 'GRC_WITH_PKG_CONFIG_CHECK' will error out if it fails.
if test x$passed = xno; then
AC_CONFIG_FILES([ \
usrp/Makefile \
@@ -100,28 +82,18 @@
esac
passed=yes
# Don't do usrp if omnithread, mblock, or pmt skipped
- if test x$omnithread_skipped = xyes; then
- AC_MSG_RESULT([Component usrp requires omnithread, which is not
being built or specified via pre-installed files.])
- passed=no
- fi
- if test x$mblock_skipped = xyes; then
- AC_MSG_RESULT([Component usrp requires mblock, which is not being
built or specified via pre-installed files.])
- passed=no
- fi
- if test x$pmt_skipped = xyes; then
- AC_MSG_RESULT([Component usrp requires pmt, which is not being
built or specified via pre-installed files.])
- passed=no
- fi
- # Don't do mblock if guile not available (inband requires it)
- AC_PATH_PROG(GUILE,guile)
- if test "$GUILE" = "" ; then
- AC_MSG_RESULT([Component mblock requires guile, which was not
found.])
- passed=no
- fi
+ GRC_CHECK_SKIPPED(usrp, [omnithread mblock pmt])
+
+ # Don't do usrp if guile not available (inband requires it)
+ GRC_CHECK_GUILE(usrp)
+
+ # Make sure libusb is installed; required for legacy USB
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.])])
+ # Make sure SDCC >= 2.4.0 is available.
+ USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware
compiler SDCC.])])
+
+ # how and where to find INCLUDES and LA
usrp_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/legacy \
-I\${abs_top_srcdir}/usrp/firmware/include"
usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
@@ -129,7 +101,7 @@
usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la"
fi
- GRC_BUILD_CONDITIONAL([usrp])
+ GRC_BUILD_CONDITIONAL(usrp)
AC_SUBST(usrp_INCLUDES)
AC_SUBST(usrp_LA)
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
2008-02-21 20:20:14 UTC (rev 7772)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
2008-02-22 17:53:46 UTC (rev 7773)
@@ -1,5 +1,5 @@
dnl
-dnl Copyright 2003 Free Software Foundation, Inc.
+dnl Copyright 2003,2008 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -20,36 +20,43 @@
dnl
AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[
- AC_ARG_WITH(fusb-tech,
- [ --with-fusb-tech=OS set fast usb technique (auto)],
- [cf_with_fusb_tech="$withval"],
- [cf_with_fusb_tech="$host_os"])
-
+ AC_ARG_WITH([fusb-tech],
+ AC_HELP_STRING([--with-fusb-tech=OS],
+ [Set fast USB technique (default=auto)]),
+ [cf_with_fusb_tech="$withval"],
+ [cf_with_fusb_tech="$host_os"])
- AC_CHECK_HEADER([linux/usbdevice_fs.h],
- [x_have_usbdevice_fs_h=yes],
- [x_have_usbdevice_fs_h=no])
-
AC_MSG_CHECKING([for fast usb technique to use])
case "$cf_with_fusb_tech" in
- linux*) if test x${x_have_usbdevice_fs_h} = xyes;
- then
- FUSB_TECH=linux
- else
- FUSB_TECH=generic
- fi ;;
-
- darwin*) FUSB_TECH=darwin ;;
- cygwin*|win*|mingw*) FUSB_TECH=win32 ;;
+ linux*)
+ AC_CHECK_HEADER([linux/usbdevice_fs.h],
+ [x_have_usbdevice_fs_h=yes],
+ [x_have_usbdevice_fs_h=no])
+ if test x${x_have_usbdevice_fs_h} = xyes;
+ then
+ FUSB_TECH=linux
+ else
+ FUSB_TECH=generic
+ fi
+ ;;
+ darwin*)
+ FUSB_TECH=darwin
+ ;;
+ cygwin*|win*|mingw*)
+ FUSB_TECH=win32
+ ;;
*bsd*)
- AC_MSG_CHECKING([for RA/WB])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]],
- [[struct usb_bulk_ra_wb_opt
o;
- ioctl(0, USB_SET_BULK_RA,
&o);]])],
- [FUSB_TECH=ra_wb],
- [FUSB_TECH=generic]) ;;
- *) FUSB_TECH=generic ;;
- esac
+ AC_MSG_CHECKING([for RA/WB])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]],
+ [[struct usb_bulk_ra_wb_opt o;
+ ioctl(0, USB_SET_BULK_RA, &o);]])],
+ [FUSB_TECH=ra_wb],
+ [FUSB_TECH=generic])
+ ;;
+ *)
+ FUSB_TECH=generic
+ ;;
+ esac
AC_MSG_RESULT($FUSB_TECH)
AC_SUBST(FUSB_TECH)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7773 - gnuradio/branches/developers/michaelld/bc_behavior/config,
michaelld <=