[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7855 - in gnuradio/branches/developers/michaelld/bc_b
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r7855 - in gnuradio/branches/developers/michaelld/bc_behavior: . config gnuradio-core gr-wxgui mblock pmt usrp |
|
Date: |
Wed, 27 Feb 2008 07:23:11 -0700 (MST) |
Author: michaelld
Date: 2008-02-27 07:23:11 -0700 (Wed, 27 Feb 2008)
New Revision: 7855
Modified:
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
gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_libusb.m4
gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in
gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in
gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in
gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in
gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in
Log:
Rewrite of much of the build code:
* Now passes both "stress tests"; working on a 3rd that will test out
all options. While the user can still mess with the build system
using pre-installed libraries and headers, the build system should
handle this robustly.
* Changed --with logic such that if a given component is declared
--with, then all of its dependencies must also be --with'd.
* Internally prepends $prefix to PKG_CONFIG_PATH before any checks.
* Fixed PKG_CONFIG .pc.in files to use "Requires:" properly to obtain
other parameters (e.g. --libs or --includes).
* Fixed PKG_CONFIG --with-foo[=arg] logic:
if arg not provided:
use provided PKG_CONFIG_PATH; if 'foo' not found, then error out.
else (arg provided):
verify that arg/foo.pc exists; if not, error out.
save provided PKG_CONFIG_PATH
with PKG_CONFIG_PATH=arg:
if 'foo' not found:
with PKG_CONFIG_PATH=arg:{saved PKG_CONFIG_PATH}:
if 'foo' not found then error out.
[if the code gets to here, then 'foo' was found]
update the PKG_CONFIG_PATH to be arg:{saved PKG_CONFIG_PATH}.
* Fixed libusb code to try PKG_CONFIG first, and if that fails then to
revert to the previous code.
* Fixed all grc_*.m4 files to only do something if the user has
selected that as an option; e.g. if --disable-all-components is
specified, then only those components that are --enable'd will do
their checks.
* Converted '#' -> 'dnl' throughout;
* Cleaned up files more.
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -17,201 +17,247 @@
dnl the Free Software Foundation, Inc., 51 Franklin Street,
dnl Boston, MA 02110-1301, USA.
-# Create --enable-foo argument for named component, create variables as needed
-# $1 is component name
+dnl Create --enable-foo argument for named component, create variables as
needed
+dnl $1 is component name
AC_DEFUN([GRC_ENABLE], [
_GRC_ENABLE($1,m4_bpatsubst($1,-,_))
])
-# $2 is the '_'d component name
+dnl $2 is the '_'d component name
+dnl on exit variable enable_$2 will be set to [yes|no];
+dnl passed will be [yes|no] (same as enable_$2)
AC_DEFUN([_GRC_ENABLE],[
+ passed=yes
AC_ARG_ENABLE([$1],
AC_HELP_STRING([--enable-$1],
[Do not build if $1 fails configuration]),
- [],
- [[enable_]$2=$enable_all_components])
+ [],[
+ [enable_]$2=$enable_all_components
+ if test x$enable_all_components != xyes; then
+ passed=no
+ fi
+ ])
])
-# Create --with-foo argument for named compoment, create variables as needed
-# $1 is component name
-# $2 is what to do on success
-# $3 is the PKG_CONFIG name; if not given, then $1
+dnl Create --with-foo argument for named compoment, create variables as needed
+dnl $1 is component name
+dnl $2 is what to do on success
+dnl $3 is the PKG_CONFIG name; if not given, then $1
AC_DEFUN([GRC_WITH], [
- if test "x$3" == "x"; then
+ if test [x]$3 = x; then
pc_comp_name="$1"
else
pc_comp_name="$3"
fi
- _GRC_WITH($1,$2,$3,m4_bpatsubst($1,-,_))
+ _GRC_WITH($1,[$2],${pc_comp_name},m4_bpatsubst($1,-,_))
])
-# $3 is the pkg-config component name
-# $4 is the '_'d component name
+dnl $3 is the pkg-config component name
+dnl $4 is the '_'d component name
+dnl on exit variable passed will be [yes|no|with]:
+dnl yes: if --enable-$1 and/or --enable-all-components was specified,
+dnl but --with was not;
+dnl with: if --with-$1 was specified, and passed checks;
+dnl no: all other conditions
AC_DEFUN([_GRC_WITH],[
AC_ARG_WITH([$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"
+ [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
+ _GRC_WITH_PKG_CONFIG_CHECK($1,$3,$4)
+ ifelse([$2], , :, [$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.
+dnl Use 'pkgconfig' to check for a package
+dnl $1 is the --with component name
+dnl $2 is the pkg-config component name, if provided; otherwise use $1 for this
+dnl on success, resulting INCLUDES, INCLUDEDIR, LA, and LIBDIRPATH variables
+dnl will be set; on failure, will exit with an error.
AC_DEFUN([GRC_WITH_PKG_CONFIG_CHECK], [
- if test "x$2" == "x"; then
+ 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,-,_))
+ _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
+dnl $2 is the pkg-config component name
+dnl $3 is the '_'d component name
AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
- # save PKG_CONFIG_PATH, restore at the end
+ dnl save PKG_CONFIG_PATH, restore at the end
s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- # create the PKG_CONFIG_PATH, via this component's arg, if provided;
- # else use the environment's PKG_CONFIG_PATH
+ dnl create the PKG_CONFIG_PATH, via this component arg, if provided;
+ dnl else use the environment PKG_CONFIG_PATH
l_PKG_CONFIG_PATH=$[with_]$3[_val]
- if test x$l_PKG_CONFIG_PATH != x; then
+ if test "x$l_PKG_CONFIG_PATH" != "x"; then
export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
+
+ dnl verify that the file exists; if not, no point in continuing
+ if ! test -r ${l_PKG_CONFIG_PATH}/$2[.pc]; then
+ AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with
provided PKG_CONFIG_PATH = @<:@ $l_PKG_CONFIG_PATH @:>@ .])
+ fi
fi
- # do the check; error out if not found
- PKG_CHECK_EXISTS($2, passed=with,
- AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info.]))
+ dnl do the check; error out if not found
+ PKG_CHECK_EXISTS($2, [passed=with; check1=yes], [
+ check1=no
+ dnl pkg-config returned an error; this might be that the .pc
+ dnl file was not valid, or the Requires: were not met.
+ dnl If the arg was provided and the input PKG_CONFIG_PATH , then try
+ dnl again appending the whole PKG_CONFIG_PATH.
+ if test "x$l_PKG_CONFIG_PATH" != "x"; then
+ if test "x$s_PKG_CONFIG_PATH" != "x"; then
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+ PKG_CHECK_EXISTS($2, passed=with, passed=no)
+ fi
+ fi
+ if test x$passed != xwith; then
+ AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2,
with PKG_CONFIG_PATH = @<:@ $PKG_CONFIG_PATH @:>@ .])
+ fi
+ dnl pkg-config Requires are now met; save the new PKG_CONFIG_PATH
+ s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ ])
- # if PKG_CHECK_EXISTS returned, then this component's .pc file was
- # found in the provided 'arg' PKG_CONFIG_PATH;
- # retrieve various parameters
+ dnl if PKG_CHECK_EXISTS returned, then this component's .pc file was
+ dnl found in the provided 'arg' PKG_CONFIG_PATH;
+ dnl retrieve various parameters
$3[_INCLUDES]=`$PKG_CONFIG --cflags-only-I $2`
$3[_LA]=`$PKG_CONFIG --libs $2`
$3[_INCLUDEDIR]=`$PKG_CONFIG --variable=includedir $2`
- GRC_PREFIX_LDFLAGS($prefix, $3, `$PKG_CONFIG --variable=libdir $2`)
-
- # restore the saved PKG_CONFIG_PATH, in case any other component needs it
- export PKG_CONFIG_PATH=${s_PKG_CONFIG_PATH}
+ if test x$check1 = xyes; then
+ dnl prepend the args PKG_CONFIG_PATH to the saved one, if the
+ dnl saved version was not empty
+ if test "x$s_PKG_CONFIG_PATH" != "x"; then
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
+ fi
+ fi
])
-# Check the $prefix versus the --with libdirpath for this component
-# $1 is the prefix
-# $2 is the --with component name
-# $3 is the --with component library path
+dnl Check the $prefix versus the --with libdirpath for this component
+dnl $1 is the prefix
+dnl $2 is the --with component name
+dnl $3 is the --with component library path
AC_DEFUN([GRC_PREFIX_LDFLAGS],[
$2[_LIBDIRPATH]=$3
- # create LDFLAGS for this --with, if different from the provided $prefix
- if test [x]"$1"[/lib] != [x]"$3"; then
+ dnl create LDFLAGS for this --with, if different from the provided $prefix
+ if test [x]$1[/lib] != [x]$3; then
$2[_LDFLAG]=[-L]$3
else
$2[_LDFLAG]=
fi
])
-# 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
+dnl Check to make sure this dependency is fulfilled for this component
+dnl $1 is the component's name
+dnl $2 is the component dependency name
+dnl On input and exit, $passed will be:
+dnl with : if --with passed muster
+dnl yes : if --enable passed muster
+dnl no : otherwise
+dnl If trying --with, will error-out if any dependency was not --with'd
+AC_DEFUN([GRC_CHECK_DEPENDENCY],[
+ if test x$passed != xno; then
+ if test x$passed = xyes; then
+ dnl make sure this dependency was not skipped
+ if test [x$]m4_bpatsubst($2,-,_)[_skipped] = xyes; then
+ AC_MSG_RESULT([Component $1 requires $2, which is not being
built or specified via pre-installed files.])
+ passed=no
+ fi
+ else
+ dnl make sure this dependency was --with'd only; not --enable'd
+ if test [x$]m4_bpatsubst($2,-,_)[_with] = xno; then
+ AC_MSG_ERROR([Component $1 requires $2 to be included as
--with-$1@<:@=arg@:>@])
+ fi
fi
- done
+ fi
])
-# Check to make sure GUILE is available
-# $1 is the component name
+dnl Check to make sure GUILE is available
+dnl $1 is the component name
AC_DEFUN([GRC_CHECK_GUILE],[
AC_PATH_PROG(GUILE,guile)
- if test "$GUILE" = "" ; then
+ if test x"$GUILE" = x; 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
-# $3 is the separator (for paths, ":"; for includes " ")
+dnl Add the specified "with" list; clear the provided variable
+dnl $1 is the component name
+dnl $2 is the path list name suffix
+dnl $3 is the separator (for paths, ":"; for includes " ")
AC_DEFUN([GRC_ADD_TO_LIST],[
- if test "x${$1_$2}" != "x"; then
- if test "x$with_$2" = "x"; then
- with_$2="${$1_$2}"
+ if test "x${$1[_]$2}" != "x"; then
+ if test "x$[with_]$2" = "x"; then
+ [with_]$2="${$1[_]$2}"
else
- with_$2="${$1_$2}"$3"$with_$2"
+ [with_]$2="${$1[_]$2}"$3"$[with_]$2"
fi
- $1_$2=
+ $1[_]$2=
fi
])
-# Conditionally build named component.
-# $1 is component name
-# $2 is executed if configuration passes and build is desired
+dnl Conditionally build named component.
+dnl $1 is component name
+dnl $2 is executed if configuration passes and build is desired
AC_DEFUN([GRC_BUILD_CONDITIONAL],[
- _GRC_BUILD_CONDITIONAL($1, m4_bpatsubst($1,-,_), $2)
+ _GRC_BUILD_CONDITIONAL($1, $2, m4_bpatsubst($1,-,_))
])
-
-# $1 is the component name
-# $2=m4_bpatsubst($1,-,_)
-# $3 is executed if configuration passes and build is desired
-# Use $passed=no to indicate configuration failure
-# Use $passed=with to indicate the use of pre-installed libraries and headers
-# Any other value of $passed, including blank, assumes success
+dnl $3=m4_bpatsubst($1,-,_)
+dnl Use $passed=no to indicate configuration failure;
+dnl Use $passed=with to indicate the use of pre-installed libraries and
headers;
+dnl Any other value of $passed, including blank, assumes success;
+dnl Defines $3_with=[yes|no] depending on if $passed=with or not (respectively)
+dnl Defines $3_skipped=[yes|no] depending on if $passed=no or not
(respectively)
AC_DEFUN([_GRC_BUILD_CONDITIONAL],[
+ $3[_with]=no
if test x$passed = xno; then
- if test x$enable_$2 = xyes; then
- AC_MSG_ERROR([Component $1 has errors, stopping.])
+ if test x$[enable_]$3 = xyes; then
+ AC_MSG_ERROR([Component $1 has errors; stopping.])
else
AC_MSG_RESULT([Not building component $1.])
fi
else
if test x$passed = xwith; then
with_dirs="$with_dirs $1"
- GRC_ADD_TO_LIST($2, INCLUDES, " ")
- GRC_ADD_TO_LIST($2, SWIG_INCLUDES, " ")
- GRC_ADD_TO_LIST($2, PYDIRPATH, ":")
- GRC_ADD_TO_LIST($2, SWIGDIRPATH, ":")
- GRC_ADD_TO_LIST($2, LIBDIRPATH, ":")
+ GRC_ADD_TO_LIST($3, INCLUDES, " ")
+ GRC_ADD_TO_LIST($3, SWIG_INCLUDES, " ")
+ GRC_ADD_TO_LIST($3, PYDIRPATH, ":")
+ GRC_ADD_TO_LIST($3, SWIGDIRPATH, ":")
+ GRC_ADD_TO_LIST($3, LIBDIRPATH, ":")
AC_MSG_RESULT([Component $1 will be included from a pre-installed
library and includes.])
+ $3[_with]=yes
else
- $2[_LDFLAG]=
- if test x$enable_$2 != xno; then
- $3
+ $3[_LDFLAG]=
+ if test x$[enable_]$3 != xno; then
+ ifelse([$2], , :, [$2])
build_dirs="$build_dirs $1"
- AC_MSG_RESULT([Component $1 passed configuration checks,
building.])
+ AC_MSG_RESULT([Component $1 passed configuration checks;
building.])
else
passed=no
- AC_MSG_RESULT([Component $1 passed configuration checks, but
not building.])
+ AC_MSG_RESULT([Component $1 passed configuration checks; but
not building.])
fi
fi
fi
if test x$passed = xno; then
skipped_dirs="$skipped_dirs $1"
- $2_skipped=yes
+ $3[_skipped]=yes
else
- AC_SUBST($2[_INCLUDES])
- AC_SUBST($2[_LA])
- AC_SUBST($2[_INCLUDEDIR])
- AC_SUBST($2[_LIBDIRPATH])
- AC_SUBST($2[_LDFLAG])
- $2_skipped=no
+ AC_SUBST($3[_INCLUDES])
+ AC_SUBST($3[_LA])
+ AC_SUBST($3[_INCLUDEDIR])
+ AC_SUBST($3[_LIBDIRPATH])
+ AC_SUBST($3[_LDFLAG])
+ $3[_skipped]=no
fi
])
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -19,6 +19,7 @@
AC_DEFUN([GRC_GNURADIO_CORE],[
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"
@@ -26,9 +27,43 @@
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
+
+ dnl Don't do gnuradio-core if omnithread skipped
+ GRC_CHECK_DEPENDENCY(gnuradio-core, omnithread)
+
+ 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 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 \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/gengen \
+-I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \
+-I\${abs_top_builddir}/gnuradio-core/src/lib/filter \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/io \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \
+-I\${abs_top_builddir}/gnuradio-core/src/lib/swig \
+\$(FFTW3F_CFLAGS)"
+
gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la"
+
gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i"
+
gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs"
+
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
+
+ dnl other externally-required gnuradio-core variables
+ AC_SUBST(gnuradio_core_I)
+ AC_SUBST(gnuradio_core_SWIGDIRPATH)
+ AC_SUBST(gnuradio_core_PYDIRPATH)
+
+ GRC_BUILD_CONDITIONAL(gnuradio-core,[
AC_CONFIG_FILES([ \
gnuradio-core/Makefile
gnuradio-core/gnuradio-core.pc \
@@ -63,44 +98,16 @@
gnuradio-core/src/utils/Makefile \
])
- passed=yes
- # Don't do gnuradio-core if omnithread skipped
- 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 \
- -I\${abs_top_srcdir}/gnuradio-core/src/lib/gengen \
- -I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \
- -I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \
- -I\${abs_top_builddir}/gnuradio-core/src/lib/filter \
- -I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \
- -I\${abs_top_srcdir}/gnuradio-core/src/lib/io \
- -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \
- -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \
- -I\${abs_top_builddir}/gnuradio-core/src/lib/swig \
- \$(FFTW3F_CFLAGS)"
-
gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la"
-
gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i"
-
gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs"
-
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,[
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])
dnl kludge up initial swig dependency files
AC_CONFIG_COMMANDS([swig_deps], [
- touch gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.d
- touch gnuradio-core/src/lib/swig/gnuradio_swig_py_general.d
- touch gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.d
- touch gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.d
- touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d
- ])
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_general.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.d
+ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d
+ ])
])
- AC_SUBST(gnuradio_core_I)
- 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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_examples.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -1,46 +1,45 @@
-# Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
+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_GNURADIO_EXAMPLES],[
GRC_ENABLE(gnuradio-examples)
- AC_CONFIG_FILES([ \
- gnuradio-examples/Makefile \
- gnuradio-examples/c++/Makefile \
- gnuradio-examples/python/Makefile \
- gnuradio-examples/python/apps/hf_explorer/Makefile \
- gnuradio-examples/python/apps/hf_radio/Makefile \
- gnuradio-examples/python/apps/Makefile \
- gnuradio-examples/python/audio/Makefile \
- gnuradio-examples/python/dect/Makefile \
- gnuradio-examples/python/digital/Makefile \
- gnuradio-examples/python/digital_voice/Makefile \
- gnuradio-examples/python/multi-antenna/Makefile \
- gnuradio-examples/python/multi_usrp/Makefile \
- gnuradio-examples/python/network/Makefile \
- gnuradio-examples/python/ofdm/Makefile \
- gnuradio-examples/python/usrp/Makefile \
- ])
+ dnl Do not do gnuradio-examples if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core)
- passed=yes
- # Don't do gnuradio-examples if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gnuradio-examples, [gnuradio-core])
-
- GRC_BUILD_CONDITIONAL(gnuradio-examples)
+ GRC_BUILD_CONDITIONAL(gnuradio-examples, [
+ AC_CONFIG_FILES([ \
+ gnuradio-examples/Makefile \
+ gnuradio-examples/c++/Makefile \
+ gnuradio-examples/python/Makefile \
+ gnuradio-examples/python/apps/hf_explorer/Makefile \
+ gnuradio-examples/python/apps/hf_radio/Makefile \
+ gnuradio-examples/python/apps/Makefile \
+ gnuradio-examples/python/audio/Makefile \
+ gnuradio-examples/python/dect/Makefile \
+ gnuradio-examples/python/digital/Makefile \
+ gnuradio-examples/python/digital_voice/Makefile \
+ gnuradio-examples/python/multi-antenna/Makefile \
+ gnuradio-examples/python/multi_usrp/Makefile \
+ gnuradio-examples/python/network/Makefile \
+ gnuradio-examples/python/ofdm/Makefile \
+ gnuradio-examples/python/usrp/Makefile \
+ ])
+ ])
])
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,20 +20,19 @@
AC_DEFUN([GRC_GR_ATSC],[
GRC_ENABLE(gr-atsc)
- AC_CONFIG_FILES([\
- gr-atsc/Makefile \
- gr-atsc/doc/Makefile \
- gr-atsc/src/Makefile \
- gr-atsc/src/lib/Makefile \
- gr-atsc/src/python/Makefile \
- gr-atsc/src/python/run_tests \
- ])
+ dnl Don't do gr-atsc if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-atsc, gnuradio-core)
- passed=yes
- # Don't do gr-atsc if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-atsc, [gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-atsc,[
+ AC_CONFIG_FILES([\
+ gr-atsc/Makefile \
+ gr-atsc/doc/Makefile \
+ gr-atsc/src/Makefile \
+ gr-atsc/src/lib/Makefile \
+ gr-atsc/src/python/Makefile \
+ gr-atsc/src/python/run_tests \
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_alsa.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,22 +20,28 @@
AC_DEFUN([GRC_GR_AUDIO_ALSA],[
GRC_ENABLE(gr-audio-alsa)
- AC_CONFIG_FILES([ \
- gr-audio-alsa/Makefile \
- gr-audio-alsa/src/Makefile \
- gr-audio-alsa/src/run_tests \
- ])
+ dnl Don't do gr-audio-alsa if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-alsa, gnuradio-core)
- passed=yes
- # Don't do gr-audio-alsa if gnuradio-core skipped
- GRC_CHECK_SKIPPED(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
- # 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,[
+ AC_CONFIG_FILES([ \
+ gr-audio-alsa/Makefile \
+ gr-audio-alsa/src/Makefile \
+ gr-audio-alsa/src/run_tests \
+ ])
- 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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,22 +20,28 @@
AC_DEFUN([GRC_GR_AUDIO_JACK],[
GRC_ENABLE(gr-audio-jack)
- AC_CONFIG_FILES([ \
- gr-audio-jack/Makefile \
- gr-audio-jack/src/Makefile \
- gr-audio-jack/src/run_tests \
- ])
+ dnl Don't do gr-audio-jack if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-jack, gnuradio-core)
- passed=yes
- # Don't do gr-audio-jack if gnuradio-core skipped
- GRC_CHECK_SKIPPED(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
- # 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.])])
+ GRC_BUILD_CONDITIONAL(gr-audio-jack,[
+ AC_CONFIG_FILES([ \
+ gr-audio-jack/Makefile \
+ gr-audio-jack/src/Makefile \
+ gr-audio-jack/src/run_tests \
+ ])
- 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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,36 +20,43 @@
AC_DEFUN([GRC_GR_AUDIO_OSS],[
GRC_ENABLE(gr-audio-oss)
- AC_CONFIG_FILES([ \
- gr-audio-oss/Makefile \
- gr-audio-oss/src/Makefile \
- gr-audio-oss/src/run_tests \
- ])
+ dnl Don't do gr-audio-oss if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-oss, gnuradio-core)
- passed=yes
- # Don't do gr-audio-oss if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-audio-oss, [gnuradio-core])
-
- # Make sure the correct library and/or headers are available.
- case $host_os in
- netbsd*)
+ 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 x$passed != xno; then
+ if test $passed != no; then
OSS_LIBS=-lossaudio
AC_MSG_RESULT([Using OSS library $OSS_LIBS])
fi
;;
- darwin*)
+ 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
+ esac
+ fi
GRC_BUILD_CONDITIONAL(gr-audio-oss,[
+ AC_CONFIG_FILES([ \
+ gr-audio-oss/Makefile \
+ gr-audio-oss/src/Makefile \
+ gr-audio-oss/src/run_tests \
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,28 +20,33 @@
AC_DEFUN([GRC_GR_AUDIO_OSX],[
GRC_ENABLE(gr-audio-osx)
- AC_CONFIG_FILES([ \
- gr-audio-osx/Makefile \
- gr-audio-osx/src/Makefile \
- gr-audio-osx/src/run_tests \
- ])
+ dnl Don't do gr-audio-osx if omnithread or gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-osx, omnithread gnuradio-core)
- passed=yes
- # Don't do gr-audio-osx if omnithread or gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-audio-osx, [omnithread gnuradio-core])
-
- case "$host_os" in
- darwin*)
- MACOSX_AUDIOUNIT([],
- [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not
found.])])
+ 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
+ *)
+ AC_MSG_RESULT([gr-audio-osx will build on Mac OS X and Darwin
only.])
+ passed=no
+ ;;
+ esac
+ fi
GRC_BUILD_CONDITIONAL(gr-audio-osx,[
+ AC_CONFIG_FILES([ \
+ gr-audio-osx/Makefile \
+ gr-audio-osx/src/Makefile \
+ gr-audio-osx/src/run_tests \
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_portaudio.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,22 +20,28 @@
AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
GRC_ENABLE(gr-audio-portaudio)
- AC_CONFIG_FILES([ \
- gr-audio-portaudio/Makefile \
- gr-audio-portaudio/src/Makefile \
- gr-audio-portaudio/src/run_tests \
- ])
+ dnl Don't do gr-audio-portaudio if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-portaudio, gnuradio-core)
- passed=yes
- # Don't do gr-audio-portaudio if gnuradio-core skipped
- GRC_CHECK_SKIPPED(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
- # 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,[
+ AC_CONFIG_FILES([ \
+ gr-audio-portaudio/Makefile \
+ gr-audio-portaudio/src/Makefile \
+ gr-audio-portaudio/src/run_tests \
+ ])
- 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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -1,4 +1,3 @@
- ..
dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
@@ -21,31 +20,37 @@
AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[
GRC_ENABLE(gr-audio-windows)
- AC_CONFIG_FILES([ \
- gr-audio-windows/Makefile \
- gr-audio-windows/src/Makefile \
- gr-audio-windows/src/run_tests \
- ])
+ dnl Don't do gr-audio-windows if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-windows, gnuradio-core)
- passed=yes
- # Don't do gr-audio-windows if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-audio-windows, [gnuradio-core])
-
- 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
environment only.])
+ 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
+ esac
+ fi
GRC_BUILD_CONDITIONAL(gr-audio-windows,[
+ AC_CONFIG_FILES([ \
+ gr-audio-windows/Makefile \
+ gr-audio-windows/src/Makefile \
+ gr-audio-windows/src/run_tests \
+ ])
+
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])
])
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_comedi.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,22 +20,28 @@
AC_DEFUN([GRC_GR_COMEDI],[
GRC_ENABLE(gr-comedi)
- AC_CONFIG_FILES([ \
- gr-comedi/Makefile \
- gr-comedi/src/Makefile \
- gr-comedi/src/run_tests \
- ])
+ dnl Don't do gr-comedi if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-comedi, gnuradio-core)
- passed=yes
- # Don't do gr-comedi if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-comedi, [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-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.])])
+ fi
- # 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,[
+ AC_CONFIG_FILES([ \
+ gr-comedi/Makefile \
+ gr-comedi/src/Makefile \
+ gr-comedi/src/run_tests \
+ ])
- 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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,19 +20,18 @@
AC_DEFUN([GRC_GR_CVSD_VOCODER],[
GRC_ENABLE(gr-cvsd-vocoder)
- AC_CONFIG_FILES([\
- gr-cvsd-vocoder/Makefile \
- gr-cvsd-vocoder/src/Makefile \
- gr-cvsd-vocoder/src/lib/Makefile \
- gr-cvsd-vocoder/src/python/Makefile \
- gr-cvsd-vocoder/src/python/run_tests \
- ])
+ dnl Don't do gr-cvsd-vocoder if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-cvsd-vocoder, gnuradio-core)
- passed=yes
- # Don't do gr-cvsd-vocoder if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-cvsd-vocoder, [gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-cvsd-vocoder,[
+ AC_CONFIG_FILES([\
+ gr-cvsd-vocoder/Makefile \
+ gr-cvsd-vocoder/src/Makefile \
+ gr-cvsd-vocoder/src/lib/Makefile \
+ gr-cvsd-vocoder/src/python/Makefile \
+ gr-cvsd-vocoder/src/python/run_tests \
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gpio.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,23 +20,22 @@
AC_DEFUN([GRC_GR_GPIO],[
GRC_ENABLE(gr-gpio)
- AC_CONFIG_FILES([ \
- gr-gpio/Makefile \
- gr-gpio/src/Makefile \
- gr-gpio/src/fpga/Makefile \
- gr-gpio/src/fpga/include/Makefile \
- gr-gpio/src/fpga/top/Makefile \
- gr-gpio/src/fpga/lib/Makefile \
- gr-gpio/src/lib/Makefile \
- gr-gpio/src/python/Makefile \
- gr-gpio/src/python/run_tests
- ])
+ dnl Don't do gr-gpio if usrp skipped
+ GRC_CHECK_DEPENDENCY(gr-gpio, usrp)
- passed=yes
- # Don't do gr-gpio if usrp skipped
- GRC_CHECK_SKIPPED(gr-gpio, [usrp])
-
GRC_BUILD_CONDITIONAL(gr-gpio,[
+ AC_CONFIG_FILES([ \
+ gr-gpio/Makefile \
+ gr-gpio/src/Makefile \
+ gr-gpio/src/fpga/Makefile \
+ gr-gpio/src/fpga/include/Makefile \
+ gr-gpio/src/fpga/top/Makefile \
+ gr-gpio/src/fpga/lib/Makefile \
+ gr-gpio/src/lib/Makefile \
+ gr-gpio/src/python/Makefile \
+ gr-gpio/src/python/run_tests
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gsm_fr_vocoder.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,20 +20,19 @@
AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[
GRC_ENABLE(gr-gsm-fr-vocoder)
- AC_CONFIG_FILES([\
- gr-gsm-fr-vocoder/Makefile \
- gr-gsm-fr-vocoder/src/Makefile \
- gr-gsm-fr-vocoder/src/lib/Makefile \
- gr-gsm-fr-vocoder/src/lib/gsm/Makefile \
- gr-gsm-fr-vocoder/src/python/Makefile \
- gr-gsm-fr-vocoder/src/python/run_tests \
- ])
+ dnl Don't do gr-gsm-fr-vocoder if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-gsm-fr-vocoder, gnuradio-core)
- passed=yes
- # Don't do gr-gsm-fr-vocoder if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-gsm-fr-vocoder, [gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-gsm-fr-vocoder,[
+ AC_CONFIG_FILES([\
+ gr-gsm-fr-vocoder/Makefile \
+ gr-gsm-fr-vocoder/src/Makefile \
+ gr-gsm-fr-vocoder/src/lib/Makefile \
+ gr-gsm-fr-vocoder/src/lib/gsm/Makefile \
+ gr-gsm-fr-vocoder/src/python/Makefile \
+ gr-gsm-fr-vocoder/src/python/run_tests \
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_pager.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,17 +20,16 @@
AC_DEFUN([GRC_GR_PAGER],[
GRC_ENABLE(gr-pager)
- AC_CONFIG_FILES([\
- gr-pager/Makefile \
- gr-pager/src/Makefile \
- gr-pager/src/run_tests
- ])
+ dnl Don't do gr-pager if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-pager, gnuradio-core)
- passed=yes
- # Don't do gr-pager if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-pager, [gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-pager,[
+ AC_CONFIG_FILES([\
+ gr-pager/Makefile \
+ gr-pager/src/Makefile \
+ gr-pager/src/run_tests
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_qtgui.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,26 +20,28 @@
AC_DEFUN([GRC_GR_QTGUI],[
GRC_ENABLE(gr-qtgui)
- AC_CONFIG_FILES([ \
- gr-qtgui/Makefile \
- gr-qtgui/src/Makefile \
- gr-qtgui/src/lib/Makefile \
- ])
+ dnl Don't do gr-qtgui if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-qtgui, gnuradio-core)
- passed=yes
- # Don't do gr-qtgui if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-qtgui, [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 Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
+ PKG_CHECK_MODULES(QT, qt >= 3.3, [], [
+ PKG_CHECK_MODULES(QT, qt-mt >= 3.3, [],
+ [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt,
neither found.])])])
- # Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
- 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.])])
+ dnl Fetch QWT variables
+ GR_QWT([], [passed=no])
fi
- # Fetch QWT variables
- GR_QWT([], [passed=no])
-
- GRC_BUILD_CONDITIONAL(gr-qtgui)
+ GRC_BUILD_CONDITIONAL(gr-qtgui, [
+ AC_CONFIG_FILES([ \
+ gr-qtgui/Makefile \
+ gr-qtgui/src/Makefile \
+ gr-qtgui/src/lib/Makefile \
+ ])
+ ])
])
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,26 +20,25 @@
AC_DEFUN([GRC_GR_RADAR_MONO],[
GRC_ENABLE(gr-radar-mono)
- AC_CONFIG_FILES([ \
- gr-radar-mono/Makefile \
- gr-radar-mono/doc/Makefile \
- gr-radar-mono/src/Makefile \
- gr-radar-mono/src/fpga/Makefile \
- gr-radar-mono/src/fpga/top/Makefile \
- gr-radar-mono/src/fpga/lib/Makefile \
- gr-radar-mono/src/fpga/models/Makefile \
- gr-radar-mono/src/fpga/tb/Makefile \
- gr-radar-mono/src/lib/Makefile \
- gr-radar-mono/src/python/Makefile \
- gr-radar-mono/src/python/run_tests
- ])
+ dnl Don't do gr-radar-mono if usrp or gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-radar-mono, usrp)
+ GRC_CHECK_DEPENDENCY(gr-radar-mono, gnuradio-core)
- passed=yes
-
- # Don't do gr-radar-mono if usrp or gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-radar-mono, [usrp gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-radar-mono,[
+ AC_CONFIG_FILES([ \
+ gr-radar-mono/Makefile \
+ gr-radar-mono/doc/Makefile \
+ gr-radar-mono/src/Makefile \
+ gr-radar-mono/src/fpga/Makefile \
+ gr-radar-mono/src/fpga/top/Makefile \
+ gr-radar-mono/src/fpga/lib/Makefile \
+ gr-radar-mono/src/fpga/models/Makefile \
+ gr-radar-mono/src/fpga/tb/Makefile \
+ gr-radar-mono/src/lib/Makefile \
+ gr-radar-mono/src/python/Makefile \
+ gr-radar-mono/src/python/run_tests
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radio_astronomy.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,19 +20,18 @@
AC_DEFUN([GRC_GR_RADIO_ASTRONOMY],[
GRC_ENABLE(gr-radio-astronomy)
- AC_CONFIG_FILES([\
- gr-radio-astronomy/Makefile \
- gr-radio-astronomy/src/Makefile \
- gr-radio-astronomy/src/lib/Makefile \
- gr-radio-astronomy/src/python/Makefile \
- gr-radio-astronomy/src/python/run_tests \
- ])
+ dnl Don't do gr-radio-astronomy if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-radio-astronomy, gnuradio-core)
- passed=yes
- # Don't do gr-radio-astronomy if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-radio-astronomy, [gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-radio-astronomy,[
+ AC_CONFIG_FILES([\
+ gr-radio-astronomy/Makefile \
+ gr-radio-astronomy/src/Makefile \
+ gr-radio-astronomy/src/lib/Makefile \
+ gr-radio-astronomy/src/python/Makefile \
+ gr-radio-astronomy/src/python/run_tests \
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_sounder.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,24 +20,24 @@
AC_DEFUN([GRC_GR_SOUNDER],[
GRC_ENABLE(gr-sounder)
- AC_CONFIG_FILES([ \
- gr-sounder/Makefile \
- gr-sounder/doc/Makefile \
- gr-sounder/src/Makefile \
- gr-sounder/src/fpga/Makefile \
- gr-sounder/src/fpga/top/Makefile \
- gr-sounder/src/fpga/lib/Makefile \
- gr-sounder/src/fpga/tb/Makefile \
- gr-sounder/src/lib/Makefile \
- gr-sounder/src/python/Makefile \
- gr-sounder/src/python/run_tests
- ])
+ dnl Don't do gr-sounder if usrp or gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-sounder, usrp)
+ GRC_CHECK_DEPENDENCY(gr-sounder, gnuradio-core)
- passed=yes
- # Don't do gr-sounder if usrp or gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-sounder, [usrp gnuradio-core])
+ GRC_BUILD_CONDITIONAL(gr-sounder,[
+ AC_CONFIG_FILES([ \
+ gr-sounder/Makefile \
+ gr-sounder/doc/Makefile \
+ gr-sounder/src/Makefile \
+ gr-sounder/src/fpga/Makefile \
+ gr-sounder/src/fpga/top/Makefile \
+ gr-sounder/src/fpga/lib/Makefile \
+ gr-sounder/src/fpga/tb/Makefile \
+ gr-sounder/src/lib/Makefile \
+ gr-sounder/src/python/Makefile \
+ gr-sounder/src/python/run_tests
+ ])
- 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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_trellis.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,22 +20,21 @@
AC_DEFUN([GRC_GR_TRELLIS],[
GRC_ENABLE(gr-trellis)
- AC_CONFIG_FILES([\
- gr-trellis/Makefile \
- gr-trellis/doc/Makefile \
- gr-trellis/src/Makefile \
- gr-trellis/src/lib/Makefile \
- gr-trellis/src/python/Makefile \
- gr-trellis/src/python/run_tests \
- gr-trellis/src/examples/Makefile \
- gr-trellis/src/examples/fsm_files/Makefile
- ])
+ dnl Don't do gr-trellis if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-trellis, gnuradio-core)
- passed=yes
- # Don't do gr-trellis if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-trellis, [gnuradio-core])
-
GRC_BUILD_CONDITIONAL(gr-trellis,[
+ AC_CONFIG_FILES([\
+ gr-trellis/Makefile \
+ gr-trellis/doc/Makefile \
+ gr-trellis/src/Makefile \
+ gr-trellis/src/lib/Makefile \
+ gr-trellis/src/python/Makefile \
+ gr-trellis/src/python/run_tests \
+ gr-trellis/src/examples/Makefile \
+ gr-trellis/src/examples/fsm_files/Makefile
+ ])
+
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_usrp.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,17 +20,17 @@
AC_DEFUN([GRC_GR_USRP],[
GRC_ENABLE(gr-usrp)
- AC_CONFIG_FILES([ \
- gr-usrp/Makefile \
- gr-usrp/src/Makefile \
- gr-usrp/src/run_tests \
- ])
+ dnl Don't do gr-usrp if usrp or gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-usrp, usrp)
+ GRC_CHECK_DEPENDENCY(gr-usrp, gnuradio-core)
- passed=yes
- # Don't do gr-usrp if usrp or gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-usrp, [usrp gnuradio-core])
+ GRC_BUILD_CONDITIONAL(gr-usrp,[
+ AC_CONFIG_FILES([ \
+ gr-usrp/Makefile \
+ gr-usrp/src/Makefile \
+ gr-usrp/src/run_tests \
+ ])
- 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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_utils.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,16 +20,17 @@
AC_DEFUN([GRC_GR_UTILS],[
GRC_ENABLE(gr-utils)
- AC_CONFIG_FILES([ \
- gr-utils/Makefile \
- gr-utils/src/Makefile \
- gr-utils/src/lib/Makefile \
- gr-utils/src/python/Makefile \
+ dnl Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped
+ GRC_CHECK_DEPENDENCY(gr-utils, gnuradio-core)
+ GRC_CHECK_DEPENDENCY(gr-utils, usrp)
+ GRC_CHECK_DEPENDENCY(gr-utils, gr-wxgui)
+
+ GRC_BUILD_CONDITIONAL(gr-utils, [
+ AC_CONFIG_FILES([ \
+ gr-utils/Makefile \
+ gr-utils/src/Makefile \
+ gr-utils/src/lib/Makefile \
+ gr-utils/src/python/Makefile \
+ ])
])
-
- passed=yes
- # Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped
- GRC_CHECK_SKIPPED(gr-utils, [gnuradio-core usrp gr-wxgui])
-
- 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-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_video_sdl.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,24 +20,30 @@
AC_DEFUN([GRC_GR_VIDEO_SDL],[
GRC_ENABLE([gr-video-sdl])
- AC_CONFIG_FILES([ \
- gr-video-sdl/Makefile \
- gr-video-sdl/src/Makefile \
- gr-video-sdl/src/run_tests \
- ])
-
- passed=yes
- # Don't do gr-video-sdl if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-video-sdl, [gnuradio-core])
+ dnl Don't do gr-video-sdl if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(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.])])
+ 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-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.])])
+ fi
GRC_BUILD_CONDITIONAL(gr-video-sdl,[
+ AC_CONFIG_FILES([ \
+ gr-video-sdl/Makefile \
+ gr-video-sdl/src/Makefile \
+ gr-video-sdl/src/run_tests \
+ ])
+
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
+
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_sdl], [chmod +x
gr-video-sdl/src/run_tests])
])
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -19,26 +19,29 @@
AC_DEFUN([GRC_GR_WXGUI],[
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 \
- gr-wxgui/gr-wxgui.pc \
- gr-wxgui/src/Makefile \
- gr-wxgui/src/python/Makefile \
- ])
- passed=yes
- # Don't do gr-wxgui if gnuradio-core skipped
- GRC_CHECK_SKIPPED(gr-wxgui, [gnuradio-core])
+ dnl Don't do gr-wxgui if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-wxgui, gnuradio-core)
- # Don't do gr-wxgui if wxPython is not available
+ 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-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, [
+ AC_CONFIG_FILES([ \
+ gr-wxgui/Makefile \
+ gr-wxgui/gr-wxgui.pc \
+ gr-wxgui/src/Makefile \
+ gr-wxgui/src/python/Makefile \
+ ])
+ ])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -19,10 +19,27 @@
AC_DEFUN([GRC_MBLOCK],[
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
+
+ dnl Don't do mblock if omnithread or pmt skipped
+ GRC_CHECK_DEPENDENCY(mblock, pmt)
+ GRC_CHECK_DEPENDENCY(mblock, omnithread)
+
+ 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 mblock if guile not available
+ GRC_CHECK_GUILE(mblock)
+
+ dnl 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,[
AC_CONFIG_FILES([\
mblock/Makefile \
mblock/mblock.pc \
@@ -32,19 +49,7 @@
mblock/src/scheme/Makefile \
mblock/src/scheme/gnuradio/Makefile \
])
- passed=yes
- # Don't do mblock if omnithread or pmt skipped
- GRC_CHECK_SKIPPED(mblock, [omnithread pmt])
- # Don't do mblock if guile not available
- 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,[
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])
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -19,23 +19,26 @@
AC_DEFUN([GRC_OMNITHREAD],[
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
+ 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 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,[
+ AC_CONFIG_FILES([ \
+ omnithread/Makefile \
+ omnithread/gnuradio-omnithread.pc
+ ])
+
dnl run_tests is created from run_tests.in. Make it executable.
dnl AC_CONFIG_COMMANDS([run_tests_omnithread], [chmod +x
omnithread/run_tests])
])
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -20,9 +20,24 @@
AC_DEFUN([GRC_PMT],[
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
+
+ dnl Don't do pmt if omnithread skipped
+ GRC_CHECK_DEPENDENCY(pmt, omnithread)
+
+ 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 pmt if guile not available
+ GRC_CHECK_GUILE(pmt)
+
+ dnl 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,[
AC_CONFIG_FILES([\
pmt/Makefile \
pmt/pmt.pc \
@@ -32,19 +47,7 @@
pmt/src/scheme/Makefile \
pmt/src/scheme/gnuradio/Makefile \
])
- passed=yes
- # Don't do pmt if omnithread skipped
- GRC_CHECK_SKIPPED(pmt, [omnithread])
- # Don't do pmt if guile not available
- 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,[
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])
])
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -19,16 +19,57 @@
AC_DEFUN([GRC_USRP],[
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
+
+ GRC_WITH(usrp, [GRC_WITH_PKG_CONFIG_CHECK(usrp-inband)])
+
+ dnl Don't do usrp if omnithread, mblock, or pmt skipped
+ GRC_CHECK_DEPENDENCY(usrp, omnithread)
+ GRC_CHECK_DEPENDENCY(usrp, mblock)
+ GRC_CHECK_DEPENDENCY(usrp, pmt)
+
+ dnl Make sure the fast usb technique is set, OS dependent.
+ dnl This is always performed, since it puts out CLI flags.
+ USRP_SET_FUSB_TECHNIQUE
+
+### ([], [passed=no; AC_MSG_RESULT([Unable to set fast USB technique.])])
+
+ 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 gnulib.
+ dnl FIXME: this needs to fail gracefully and continue, not implemented
yet
+ UTILS_FUNC_MKSTEMP
+
+ dnl These checks don't fail
+ AC_C_BIGENDIAN
+ AC_CHECK_HEADERS([byteswap.h linux/compiler.h])
+ AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
+ AC_CHECK_FUNCS([sigaction snprintf])
+
+ dnl Don't do usrp if guile not available (inband requires it)
+ GRC_CHECK_GUILE(usrp)
+
+ dnl Make sure libusb is installed; required for legacy USB
+ USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to find dependency
libusb.])])
+
+ dnl Make sure SDCC >= 2.4.0 is available.
+ USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware
compiler SDCC.])])
+
+ dnl 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"
+ usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
+
usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la"
+ fi
+
+ dnl Include the usrp-inband INCLUDES and LA
+ AC_SUBST(usrp_inband_INCLUDES)
+ AC_SUBST(usrp_inband_LA)
+
+ GRC_BUILD_CONDITIONAL(usrp,[
AC_CONFIG_FILES([ \
usrp/Makefile \
usrp/usrp.pc \
@@ -55,53 +96,18 @@
usrp/fpga/Makefile \
usrp/fpga/rbf/Makefile \
])
+ ])
- # gnulib.
- # FIXME: this needs to fail gracefully and continue, not implemented
yet
- UTILS_FUNC_MKSTEMP
-
- # These checks don't fail
- AC_C_BIGENDIAN
- AC_CHECK_HEADERS([byteswap.h linux/compiler.h])
- AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
- AC_CHECK_FUNCS([sigaction snprintf])
-
- passed=yes
- # Don't do usrp if omnithread, mblock, or pmt skipped
- 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.])])
-
- # 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"
- usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
-
usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la"
- fi
-
- GRC_BUILD_CONDITIONAL(usrp)
-
- # There are 2 pkg-config files (usrp, and usrp-inband); the one
- # for usrp requires omnithread for Darwin only. Create a variable
- # for just the usrp.pc.in case.
+ dnl There are 2 pkg-config files (usrp, and usrp-inband); the one
+ dnl for usrp requires omnithread for Darwin only. Create a variable
+ dnl for just the usrp.pc.in case.
case "$host_os" in
darwin*)
- usrp_darwin_omnithread_pc_la="$omnithread_LDFLAG -lgromnithread"
+ usrp_darwin_omnithread_pc_requires="gnuradio-omnithread"
;;
- *) # (blanks)
- usrp_darwin_omnithread_pc_la=""
+ *) dnl (blanks)
+ usrp_darwin_omnithread_pc_requires=""
;;
esac
-
- AC_SUBST(usrp_inband_INCLUDES)
- AC_SUBST(usrp_inband_LA)
- AC_SUBST(usrp_darwin_omnithread_pc_la)
+ AC_SUBST(usrp_darwin_omnithread_pc_requires)
])
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-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -31,8 +31,7 @@
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
+ if test x${x_have_usbdevice_fs_h} = xyes; then
FUSB_TECH=linux
else
FUSB_TECH=generic
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_libusb.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_libusb.m4
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_libusb.m4
2008-02-27 14:23:11 UTC (rev 7855)
@@ -1,57 +1,48 @@
-# Check for libusb support. -*- Autoconf -*-
+dnl Copyright 2003,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.
-# Copyright 2003 Free Software Foundation, Inc.
+AC_DEFUN([USRP_LIBUSB], [
+ libusbok=yes
+ PKG_CHECK_MODULES(USB, libusb, [], [
+ AC_LANG_PUSH(C)
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+ AC_CHECK_HEADERS([usb.h], [], [libusbok=no; AC_MSG_RESULT([USRP
requires libusb. usb.h not found. See http://libusb.sf.net])])
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+ save_LIBS="$LIBS"
+ case "$host_os" in
+ darwin*)
+ LIBS="$LIBS -lIOKit"
+ ;;
+ *) ;;
+ esac
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
+ AC_SEARCH_LIBS(usb_bulk_write, [usb], [USB_LIBS="$LIBS"], [libusbok=no;
AC_MSG_RESULT([USRP requires libusb. usb_bulk_write not found. See
http://libusb.sf.net])])
-AC_DEFUN([USRP_LIBUSB],
-[
- AC_LANG_PUSH(C)
-
- libusbok=yes
- AC_CHECK_HEADERS([usb.h],
- [],
- [libusbok=no,
- AC_MSG_RESULT([USRP requires libusb. usb.h not found. See
http://libusb.sf.net])]
- )
-
- save_LIBS="$LIBS"
- case "$host_os" in
- darwin*) LIBS="$LIBS -lIOKit" ;;
- *) ;;
- esac
- AC_SEARCH_LIBS(usb_bulk_write, [usb],
- [USB_LIBS="$LIBS"],
- [libusbok=no,
- AC_MSG_RESULT([USRP requires libusb. usb_bulk_write not found. See
http://libusb.sf.net])]
- )
LIBS="$save_LIBS"
- AC_LANG_POP
+ AC_LANG_POP
+ ])
- # try to find the -L LDFLAG for libusb, using PKGCONFIG
- PKG_CHECK_EXISTS(libusb,
- [libusb_LDFLAG=-L`$PKG_CONFIG --variable=libdir libusb`],
- [libusb_LDFLAG=])
- AC_SUBST(libusb_LDFLAG)
-
- if test $libusbok = yes; then
- AC_SUBST(USB_LIBS)
- ifelse([$1], , :, [$1])
- else
- ifelse([$2], , :, [$2])
- fi
+ if test x$libusbok = xyes; then
+ AC_SUBST(USB_LIBS)
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
])
Modified: gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
2008-02-27 14:23:11 UTC (rev 7855)
@@ -250,7 +250,7 @@
GRC_GR_VIDEO_SDL
GRC_GR_WXGUI
GRC_GR_SOUNDER dnl this must come after GRC_USRP
-GRC_GR_UTILS
+GRC_GR_UTILS dnl this must come after GRC_GR_WXGUI
GRC_GNURADIO_EXAMPLES dnl must come last
# Each component is now either to be built, was skipped, will be
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
2008-02-27 02:27:25 UTC (rev 7854)
+++
gnuradio/branches/developers/michaelld/bc_behavior/gnuradio-core/gnuradio-core.pc.in
2008-02-27 14:23:11 UTC (rev 7855)
@@ -5,7 +5,7 @@
Name: gnuradio-core
Description: GNU Software Radio toolkit
-Requires:
+Requires: gnuradio-omnithread fftw3f
Version: @VERSION@
-Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@ @omnithread_LDFLAG@
-lgromnithread
-Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
+Libs: -L${libdir} -lgnuradio-core
+Cflags: -I${includedir} @DEFINES@
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/gr-wxgui/gr-wxgui.pc.in
2008-02-27 14:23:11 UTC (rev 7855)
@@ -5,7 +5,7 @@
Name: gr-wxgui
Description: A simple wx gui for GNU Radio applications
-Requires:
+Requires: gnuradio-core
Version: @VERSION@
Libs:
Cflags:
Modified: gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/mblock/mblock.pc.in
2008-02-27 14:23:11 UTC (rev 7855)
@@ -5,7 +5,7 @@
Name: mblock
Description: The GNU Radio message block library
-Requires:
+Requires: pmt gnuradio-omnithread
Version: @VERSION@
-Libs: -L${libdir} -lmblock @omnithread_LDFLAG@ -lgromnithread @pmt_LDFLAG@
-lpmt
-Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
+Libs: -L${libdir} -lmblock
+Cflags: -I${includedir} @DEFINES@
Modified: gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/pmt/pmt.pc.in
2008-02-27 14:23:11 UTC (rev 7855)
@@ -5,7 +5,7 @@
Name: pmt
Description: The GNU Radio Polymorphic Type library
-Requires:
+Requires: gnuradio-omnithread
Version: @VERSION@
-Libs: -L${libdir} -lpmt @omnithread_LDFLAG@ -lgromnithread
-Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
+Libs: -L${libdir} -lpmt
+Cflags: -I${includedir} @DEFINES@
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp-inband.pc.in
2008-02-27 14:23:11 UTC (rev 7855)
@@ -5,7 +5,7 @@
Name: usrp
Description: USRP C++ Interface with in-band signaling
-Requires:
+Requires: mblock pmt gnuradio-omnithread libusb
Version: @VERSION@
-Libs: -L${libdir} -lusrp-inband @usrp_LDFLAG@ -lusrp @mblock_LDFLAG@ -lmblock
@pmt_LDFLAG@ -lpmt @omnithread_LDFLAG@ -lgromnithread @libusb_LDFLAG@ -lusb
+Libs: -L${libdir} -lusrp-inband -lusrp
Cflags: -I${includedir} @DEFINES@
Modified: gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in
2008-02-27 02:27:25 UTC (rev 7854)
+++ gnuradio/branches/developers/michaelld/bc_behavior/usrp/usrp.pc.in
2008-02-27 14:23:11 UTC (rev 7855)
@@ -5,7 +5,7 @@
Name: usrp
Description: USRP Client Side C++ interface
-Requires:
+Requires: libusb @usrp_darwin_omnithread_pc_requires@
Version: @VERSION@
-Libs: -L${libdir} -lusrp @usrp_darwin_omnithread_pc_la@ @libusb_LDFLAG@ -lusb
+Libs: -L${libdir} -lusrp
Cflags: -I${includedir} @DEFINES@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7855 - in gnuradio/branches/developers/michaelld/bc_behavior: . config gnuradio-core gr-wxgui mblock pmt usrp,
michaelld <=