[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7942 - in gnuradio/branches/developers/jcorgan/bc-mer
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r7942 - in gnuradio/branches/developers/jcorgan/bc-merge: . config gnuradio-core usrp |
|
Date: |
Wed, 5 Mar 2008 13:43:45 -0700 (MST) |
Author: jcorgan
Date: 2008-03-05 13:43:44 -0700 (Wed, 05 Mar 2008)
New Revision: 7942
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/gr_python.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/gr_subversion.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_build.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_core.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_examples.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_atsc.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_alsa.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_jack.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_oss.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_osx.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_portaudio.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_windows.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_comedi.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_gpio.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_gsm_fr_vocoder.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_pager.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_radar_mono.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_radio_astronomy.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_sounder.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_trellis.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_usrp.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_utils.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_video_sdl.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_wxgui.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_omnithread.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_usrp.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/pkg.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_fusb_tech.m4
gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_libusb.m4
gnuradio/branches/developers/jcorgan/bc-merge/configure.ac
gnuradio/branches/developers/jcorgan/bc-merge/gnuradio-core/gnuradio-core.pc.in
gnuradio/branches/developers/jcorgan/bc-merge/usrp/usrp.pc.in
Log:
Applied changeset r7888 on trunk to developer branch. Also needed to update
release branch pkg.m4 to match that on trunk.
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/gr_python.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/gr_python.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/gr_python.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -107,5 +107,5 @@
;;
esac
- AC_SUBST([PYTHON_LDFLAGS])
+ AC_SUBST(PYTHON_LDFLAGS)
])
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/gr_subversion.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/gr_subversion.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/gr_subversion.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -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/jcorgan/bc-merge/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_build.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_build.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -17,82 +17,271 @@
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
-AC_DEFUN([GRC_ENABLE],[
- AC_ARG_ENABLE([$1],[ --enable-$1 Fail build if $1 fails
configuration],[],
- [[enable_]m4_bpatsubst($1,-,_)=$enable_all_components])
+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,-,_))
])
+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)
-# Create --with-foo argument for named compoment, create variables as needed
-# $1 is component name
-AC_DEFUN([GRC_WITH],[
+AC_DEFUN([_GRC_ENABLE],[
+ passed=yes
+ AC_ARG_ENABLE([$1],
+ AC_HELP_STRING([--enable-$1],
+ [Stop if $1 fails configuration]),
+ [],[
+ [enable_]$2=$enable_all_components
+ if test x$enable_all_components = xno; then
+ passed=no
+ fi
+ ])
+])
+dnl Component specific configuration
+dnl The order of the GR_ macros determines the order of compilation
+dnl For -any- checks on $enable_all_components
+dnl use the following guildlines:
+dnl yes : --enable-all-components was specified, so error out if any
+dnl components do not pass configuration checks.
+dnl no : --disable-all-components was specified, so try to build the
+dnl --enable'd components, and error out if any do not pass
+dnl configuration checks.
+dnl "" : this option was not specified on the command line; try to
+dnl build all components that are not --with'd, but don't
+dnl error out if any component does not pass configuration checks.
+dnl
+dnl For each --enable-foo component, if that flag is not specified on
+dnl the command line, the related variable $enable_foo will be set to
+dnl $enable_all_components .
+
+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
+ pc_comp_name="$1"
+ else
+ pc_comp_name="$3"
+ fi
+ _GRC_WITH($1,[$2],${pc_comp_name},m4_bpatsubst($1,-,_))
+])
+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],
- [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); stop if $1 not found]),
+ [if test "x$withval" != "xyes"; then
+ [with_]$4[_val]=$withval
+ [with_]$4=yes
+ fi],
[])
+ 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,$4)
+ ifelse([$2], , :, [$2])
+ fi
+ 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 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
+ pc_comp_name="$1"
+ else
+ pc_comp_name="$2"
+ fi
+ _GRC_WITH_PKG_CONFIG_CHECK($1,${pc_comp_name},m4_bpatsubst($1,-,_))
+])
+dnl $2 is the pkg-config component name
+dnl $3 is the '_'d component name
+AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
+ dnl save PKG_CONFIG_PATH, restore at the end
+ s_PKG_CONFIG_PATH=$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
+ 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
+
+ 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 $passed != with; 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
+ ])
+
+ 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`
+
+ 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
+])
+
+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
+ 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
+])
+
+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],[
+dnl f0=[enable_]m4_bpatsubst($1,-,_)
+dnl f1=[$enable_]m4_bpatsubst($1,-,_)
+dnl echo
+dnl echo "$1 : Checking Dependency $2"
+dnl echo "$1 : enable_all_components is '$enable_all_components'"
+dnl echo "$1 : $f0 is '$f1'"
+dnl echo "$1 : passed is '$passed'"
+dnl echo
+ if test $passed != no; then
+ if test $passed = yes; 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
+ fi
+])
+
+dnl Check to make sure GUILE is available
+dnl $1 is the component name
+AC_DEFUN([GRC_CHECK_GUILE],[
+ if test x"$GUILE" = x; then
+ AC_MSG_RESULT([Component $1 requires guile, which was not found.])
+ passed=no
+ fi
+])
+
+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],[
- if test x$passed = xno; then
- if test x$enable_$2 = xyes; then
- AC_MSG_ERROR([Component $1 has errors, stopping.])
+ $3[_with]=no
+ if test $passed = no; then
+ 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
+ if test $passed = with; 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, ":")
- AC_MSG_RESULT([Component $1 will be included from a pre-installed
library and includes, and will not be built.])
+ 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
- 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
+ if test $passed = no; then
skipped_dirs="$skipped_dirs $1"
- $2_skipped=yes
+ $3[_skipped]=yes
else
- $2_skipped=no
+ $3[_skipped]=no
fi
+ AC_SUBST($3[_INCLUDES])
+ AC_SUBST($3[_LA])
+ AC_SUBST($3[_INCLUDEDIR])
+ AC_SUBST($3[_LIBDIRPATH])
+ AC_SUBST($3[_LDFLAG])
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_core.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_core.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,108 +18,98 @@
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
- if test x$passed = xno; then
- AC_CONFIG_FILES([ \
- gnuradio-core/Makefile
- gnuradio-core/gnuradio-core.pc \
- gnuradio-core/doc/Doxyfile \
- gnuradio-core/doc/Makefile \
- gnuradio-core/doc/other/Makefile \
- gnuradio-core/doc/xml/Makefile \
- gnuradio-core/src/Makefile \
- gnuradio-core/src/gen_interpolator_taps/Makefile \
- gnuradio-core/src/lib/Makefile \
- gnuradio-core/src/lib/filter/Makefile \
- gnuradio-core/src/lib/g72x/Makefile \
- gnuradio-core/src/lib/general/Makefile \
- gnuradio-core/src/lib/general/gr_prefix.cc \
- gnuradio-core/src/lib/gengen/Makefile \
- gnuradio-core/src/lib/io/Makefile \
- gnuradio-core/src/lib/missing/Makefile \
- gnuradio-core/src/lib/reed-solomon/Makefile \
- gnuradio-core/src/lib/runtime/Makefile \
- gnuradio-core/src/lib/swig/Makefile \
- gnuradio-core/src/python/Makefile \
- gnuradio-core/src/python/bin/Makefile \
- gnuradio-core/src/python/gnuradio/Makefile \
- gnuradio-core/src/python/gnuradio/blks/Makefile \
- gnuradio-core/src/python/gnuradio/blksimpl/Makefile \
- gnuradio-core/src/python/gnuradio/blks2/Makefile \
- gnuradio-core/src/python/gnuradio/blks2impl/Makefile \
- gnuradio-core/src/python/gnuradio/gr/Makefile \
- gnuradio-core/src/python/gnuradio/gr/run_tests \
- gnuradio-core/src/python/gnuradio/gru/Makefile \
- gnuradio-core/src/python/gnuradio/gruimpl/Makefile \
- gnuradio-core/src/python/gnuradio/vocoder/Makefile \
- gnuradio-core/src/tests/Makefile \
- gnuradio-core/src/utils/Makefile \
- ])
- passed=yes
+ GRC_ENABLE(gnuradio-core)
- # 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
-
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)"
+ 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 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 != with; 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
- 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
- ])
+ 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
+ ])
+ fi
+
+ dnl other externally-required gnuradio-core variables
+ AC_SUBST(gnuradio_core_I)
+ AC_SUBST(gnuradio_core_SWIGDIRPATH)
+ AC_SUBST(gnuradio_core_PYDIRPATH)
+
+ AC_CONFIG_FILES([ \
+ gnuradio-core/Makefile
+ gnuradio-core/gnuradio-core.pc \
+ gnuradio-core/doc/Doxyfile \
+ gnuradio-core/doc/Makefile \
+ gnuradio-core/doc/other/Makefile \
+ gnuradio-core/doc/xml/Makefile \
+ gnuradio-core/src/Makefile \
+ gnuradio-core/src/gen_interpolator_taps/Makefile \
+ gnuradio-core/src/lib/Makefile \
+ gnuradio-core/src/lib/filter/Makefile \
+ gnuradio-core/src/lib/g72x/Makefile \
+ gnuradio-core/src/lib/general/Makefile \
+ gnuradio-core/src/lib/general/gr_prefix.cc \
+ gnuradio-core/src/lib/gengen/Makefile \
+ gnuradio-core/src/lib/io/Makefile \
+ gnuradio-core/src/lib/missing/Makefile \
+ gnuradio-core/src/lib/reed-solomon/Makefile \
+ gnuradio-core/src/lib/runtime/Makefile \
+ gnuradio-core/src/lib/swig/Makefile \
+ gnuradio-core/src/python/Makefile \
+ gnuradio-core/src/python/bin/Makefile \
+ gnuradio-core/src/python/gnuradio/Makefile \
+ gnuradio-core/src/python/gnuradio/blks/Makefile \
+ gnuradio-core/src/python/gnuradio/blksimpl/Makefile \
+ gnuradio-core/src/python/gnuradio/blks2/Makefile \
+ gnuradio-core/src/python/gnuradio/blks2impl/Makefile \
+ gnuradio-core/src/python/gnuradio/gr/Makefile \
+ gnuradio-core/src/python/gnuradio/gr/run_tests \
+ gnuradio-core/src/python/gnuradio/gru/Makefile \
+ gnuradio-core/src/python/gnuradio/gruimpl/Makefile \
+ gnuradio-core/src/python/gnuradio/vocoder/Makefile \
+ gnuradio-core/src/tests/Makefile \
+ gnuradio-core/src/utils/Makefile \
])
- 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])
+
+ 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])
+ ])
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_examples.m4
===================================================================
---
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_examples.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gnuradio_examples.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -1,25 +1,28 @@
-# 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])
+ GRC_ENABLE(gnuradio-examples)
+ dnl Do not do gnuradio-examples if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core)
+
AC_CONFIG_FILES([ \
gnuradio-examples/Makefile \
gnuradio-examples/python/Makefile \
@@ -34,12 +37,5 @@
gnuradio-examples/python/usrp/Makefile \
])
- 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_BUILD_CONDITIONAL([gnuradio-examples])
+ GRC_BUILD_CONDITIONAL(gnuradio-examples)
])
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_atsc.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_atsc.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_atsc.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,25 +18,21 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_ATSC],[
- GRC_ENABLE([gr-atsc])
+ GRC_ENABLE(gr-atsc)
+ dnl Don't do gr-atsc if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-atsc, gnuradio-core)
+
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 \
+ 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 \
])
- 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_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/jcorgan/bc-merge/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_alsa.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_alsa.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,26 +18,28 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_ALSA],[
- GRC_ENABLE([gr-audio-alsa])
+ GRC_ENABLE(gr-audio-alsa)
+ dnl Don't do gr-audio-alsa if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-alsa, gnuradio-core)
+
+ dnl If execution gets to here, $passed will be:
+ dnl with : if the --with code didn't error out
+ dnl yes : if the --enable code passed muster and all dependencies are
met
+ dnl no : otherwise
+ if test $passed = yes; then
+ dnl Don't do gr-audio-alsa if the 'alsa' package is not installed.
+ PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],
+ [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not
found.])])
+ fi
+
AC_CONFIG_FILES([ \
- gr-audio-alsa/Makefile \
- gr-audio-alsa/src/Makefile \
- gr-audio-alsa/src/run_tests \
+ gr-audio-alsa/Makefile \
+ gr-audio-alsa/src/Makefile \
+ gr-audio-alsa/src/run_tests \
])
- 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
- # 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_SUBST(ALSA_LIBS)
+ GRC_BUILD_CONDITIONAL(gr-audio-alsa,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x
gr-audio-alsa/src/run_tests])
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_jack.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_jack.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,26 +18,28 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_JACK],[
- GRC_ENABLE([gr-audio-jack])
+ GRC_ENABLE(gr-audio-jack)
+ dnl Don't do gr-audio-jack if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-jack, gnuradio-core)
+
+ dnl If execution gets to here, $passed will be:
+ dnl with : if the --with code didn't error out
+ dnl yes : if the --enable code passed muster and all dependencies are
met
+ dnl no : otherwise
+ if test $passed = yes; then
+ dnl Don't do gr-audio-jack if in 'jack' isn't installed
+ PKG_CHECK_MODULES(JACK, jack >= 0.8, [],
+ [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not
found.])])
+ fi
+
AC_CONFIG_FILES([ \
- gr-audio-jack/Makefile \
+ gr-audio-jack/Makefile \
gr-audio-jack/src/Makefile \
- gr-audio-jack/src/run_tests \
+ gr-audio-jack/src/run_tests \
])
- 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
- # 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_SUBST(JACK_LIBS)
+ GRC_BUILD_CONDITIONAL(gr-audio-jack,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x
gr-audio-jack/src/run_tests])
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_oss.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_oss.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_oss.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,37 +18,44 @@
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 \
- 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
- 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
- # Make sure the correct library and/or headers are available.
- case $host 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_SUBST(OSS_LIBS)
AC_MSG_RESULT([Using OSS library $OSS_LIBS])
fi
;;
- *)
+ darwin*)
+ dnl OSX / Darwin can't use OSS
+ passed=no
+ ;;
+ *)
AC_CHECK_HEADER(sys/soundcard.h,[],
[passed=no;AC_MSG_RESULT([gr-audio-oss requires
sys/soundcard.h, not found.])])
- esac
+ esac
+ fi
- GRC_BUILD_CONDITIONAL([gr-audio-oss],[
- AC_SUBST(OSS_LIBS)
+ AC_CONFIG_FILES([ \
+ gr-audio-oss/Makefile \
+ gr-audio-oss/src/Makefile \
+ gr-audio-oss/src/run_tests \
+ ])
+
+ GRC_BUILD_CONDITIONAL(gr-audio-oss,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_oss], [chmod +x
gr-audio-oss/src/run_tests])
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_osx.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_osx.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_osx.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,30 +18,36 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_OSX],[
- GRC_ENABLE([gr-audio-osx])
+ GRC_ENABLE(gr-audio-osx)
+ dnl Don't do gr-audio-osx if omnithread or gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-osx, omnithread)
+ GRC_CHECK_DEPENDENCY(gr-audio-osx, gnuradio-core)
+
+ dnl If execution gets to here, $passed will be:
+ dnl with : if the --with code didn't error out
+ dnl yes : if the --enable code passed muster and all dependencies are
met
+ dnl no : otherwise
+ if test $passed = yes; then
+ case "$host_os" in
+ darwin*)
+ MACOSX_AUDIOUNIT([],
+ [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit,
not found.])])
+ ;;
+ *)
+ AC_MSG_RESULT([gr-audio-osx will build on Mac OS X and Darwin
only.])
+ passed=no
+ ;;
+ esac
+ fi
+
AC_CONFIG_FILES([ \
- gr-audio-osx/Makefile \
- gr-audio-osx/src/Makefile \
- gr-audio-osx/src/run_tests \
+ gr-audio-osx/Makefile \
+ gr-audio-osx/src/Makefile \
+ gr-audio-osx/src/run_tests \
])
- passed=yes
- MACOSX_AUDIOUNIT([],
- [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not
found.])])
-
- # 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
-
- 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/jcorgan/bc-merge/config/grc_gr_audio_portaudio.m4
===================================================================
---
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_portaudio.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_portaudio.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,26 +18,28 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
- GRC_ENABLE([gr-audio-portaudio])
+ GRC_ENABLE(gr-audio-portaudio)
+ dnl Don't do gr-audio-portaudio if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-audio-portaudio, gnuradio-core)
+
+ dnl If execution gets to here, $passed will be:
+ dnl with : if the --with code didn't error out
+ dnl yes : if the --enable code passed muster and all dependencies are
met
+ dnl no : otherwise
+ if test $passed = yes; then
+ dnl Don't do gr-audio-portaudio if the 'portaudio' library is
unavailable.
+ PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],
+ [passed=no;AC_MSG_RESULT([gr-audio-portaudio requires package
portaudio, not found.])])
+ fi
+
AC_CONFIG_FILES([ \
- gr-audio-portaudio/Makefile \
- gr-audio-portaudio/src/Makefile \
- gr-audio-portaudio/src/run_tests \
+ gr-audio-portaudio/Makefile \
+ gr-audio-portaudio/src/Makefile \
+ gr-audio-portaudio/src/run_tests \
])
- 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
- # 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_SUBST(PORTAUDIO_LIBS)
+ GRC_BUILD_CONDITIONAL(gr-audio-portaudio,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x
gr-audio-portaudio/src/run_tests])
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_windows.m4
===================================================================
---
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_windows.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_audio_windows.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,28 +18,38 @@
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 \
- 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
- 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
+ dnl If execution gets to here, $passed will be:
+ dnl with : if the --with code didn't error out
+ dnl yes : if the --enable code passed muster and all dependencies are
met
+ dnl no : otherwise
+ if test $passed = yes; then
+ case "$host_os" in
+ cygwin*|win*|mingw*)
+ dnl Don't do gr-audio-windows if the 'winmm' library isn't
available.
+ AC_HAVE_LIBRARY(winmm, [],
+ [passed=no;AC_MSG_RESULT([gr-audio-windows requires library
winmm, not found.])])
+ ;;
+ *)
+ AC_MSG_RESULT([gr-audio-windows will build on a Windows Unix
environment only.])
+ passed=no
+ ;;
+ esac
fi
- # 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_CONFIG_FILES([ \
+ gr-audio-windows/Makefile \
+ gr-audio-windows/src/Makefile \
+ gr-audio-windows/src/run_tests \
+ ])
- GRC_BUILD_CONDITIONAL([gr-audio-windows],[
+ GRC_BUILD_CONDITIONAL(gr-audio-windows,[
WINAUDIO_LIBS=-lwinmm
- AC_SUBST(WINAUDIO_LIBS)
+ 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/jcorgan/bc-merge/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_comedi.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_comedi.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,26 +18,28 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_COMEDI],[
- GRC_ENABLE([gr-comedi])
+ GRC_ENABLE(gr-comedi)
+ dnl Don't do gr-comedi if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(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
+
AC_CONFIG_FILES([ \
- gr-comedi/Makefile \
- gr-comedi/src/Makefile \
- gr-comedi/src/run_tests \
+ gr-comedi/Makefile \
+ gr-comedi/src/Makefile \
+ gr-comedi/src/run_tests \
])
- 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
- # 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_SUBST(COMEDI_LIBS)
+ GRC_BUILD_CONDITIONAL(gr-comedi,[
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/jcorgan/bc-merge/config/grc_gr_gpio.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_gpio.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_gpio.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,31 +18,24 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_GPIO],[
- GRC_ENABLE([gr-gpio])
+ GRC_ENABLE(gr-gpio)
+ dnl Don't do gr-gpio if usrp skipped
+ GRC_CHECK_DEPENDENCY(gr-gpio, usrp)
+
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
+ 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
])
- 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_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/jcorgan/bc-merge/config/grc_gr_gsm_fr_vocoder.m4
===================================================================
---
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_gsm_fr_vocoder.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_gsm_fr_vocoder.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,25 +18,21 @@
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)
+ dnl Don't do gr-gsm-fr-vocoder if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-gsm-fr-vocoder, gnuradio-core)
+
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 \
+ 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 \
])
- 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_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/jcorgan/bc-merge/config/grc_gr_pager.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_pager.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_pager.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,22 +18,18 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_PAGER],[
- GRC_ENABLE([gr-pager])
+ GRC_ENABLE(gr-pager)
+ dnl Don't do gr-pager if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-pager, gnuradio-core)
+
AC_CONFIG_FILES([\
- gr-pager/Makefile \
- gr-pager/src/Makefile \
- gr-pager/src/run_tests
+ gr-pager/Makefile \
+ gr-pager/src/Makefile \
+ gr-pager/src/run_tests
])
- 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_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/jcorgan/bc-merge/config/grc_gr_radar_mono.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_radar_mono.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_radar_mono.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,34 +18,27 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_RADAR_MONO],[
- GRC_ENABLE([gr-radar-mono])
+ GRC_ENABLE(gr-radar-mono)
+ 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)
+
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
+ 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
])
- 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_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/jcorgan/bc-merge/config/grc_gr_radio_astronomy.m4
===================================================================
---
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_radio_astronomy.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_radio_astronomy.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,24 +18,20 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_RADIO_ASTRONOMY],[
- GRC_ENABLE([gr-radio-astronomy])
+ GRC_ENABLE(gr-radio-astronomy)
+ dnl Don't do gr-radio-astronomy if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-radio-astronomy, gnuradio-core)
+
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 \
+ 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 \
])
- 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_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/jcorgan/bc-merge/config/grc_gr_sounder.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_sounder.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_sounder.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,33 +18,26 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_SOUNDER],[
- GRC_ENABLE([gr-sounder])
+ GRC_ENABLE(gr-sounder)
+ 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)
+
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
+ 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
])
- 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_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/jcorgan/bc-merge/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_trellis.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_trellis.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,27 +18,23 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_TRELLIS],[
- GRC_ENABLE([gr-trellis])
+ GRC_ENABLE(gr-trellis)
+ dnl Don't do gr-trellis if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-trellis, gnuradio-core)
+
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
+ 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
])
- 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_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/jcorgan/bc-merge/config/grc_gr_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_usrp.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_usrp.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,26 +18,19 @@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_USRP],[
- GRC_ENABLE([gr-usrp])
+ GRC_ENABLE(gr-usrp)
+ 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)
+
AC_CONFIG_FILES([ \
- gr-usrp/Makefile \
- gr-usrp/src/Makefile \
- gr-usrp/src/run_tests \
+ gr-usrp/Makefile \
+ gr-usrp/src/Makefile \
+ gr-usrp/src/run_tests \
])
- 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_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/jcorgan/bc-merge/config/grc_gr_utils.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_utils.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_utils.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,29 +18,19 @@
# Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_UTILS],[
- GRC_ENABLE([gr-utils])
+ GRC_ENABLE(gr-utils)
+ 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)
+
AC_CONFIG_FILES([ \
gr-utils/Makefile \
- gr-utils/src/Makefile \
- gr-utils/src/lib/Makefile \
- gr-utils/src/python/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
- 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_BUILD_CONDITIONAL([gr-utils])
+ GRC_BUILD_CONDITIONAL(gr-utils)
])
Modified:
gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_video_sdl.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_video_sdl.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -20,26 +20,28 @@
AC_DEFUN([GRC_GR_VIDEO_SDL],[
GRC_ENABLE([gr-video-sdl])
+ dnl Don't do gr-video-sdl if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-video-sdl, 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-video-sdl if the SDL library is unavailable.
+ PKG_CHECK_MODULES(SDL, sdl >= 1.2.0, [],
+ [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
+
AC_CONFIG_FILES([ \
- gr-video-sdl/Makefile \
- gr-video-sdl/src/Makefile \
- gr-video-sdl/src/run_tests \
+ 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
- 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
- # 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],[
- AC_SUBST(SDL_CFLAGS)
- AC_SUBST(SDL_LIBS)
+ GRC_BUILD_CONDITIONAL(gr-video-sdl,[
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/jcorgan/bc-merge/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_wxgui.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_gr_wxgui.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,37 +18,30 @@
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
- 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 \
- ])
+ GRC_ENABLE(gr-wxgui)
- 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
- # Don't do gr-wxgui if wxPython is not available
+ GRC_WITH(gr-wxgui)
+
+ dnl Don't do gr-wxgui if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-wxgui, 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-wxgui if wxPython is not available
if ! ${PYTHON} -c 'import wx'; then
passed=no
fi
fi
- 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 \
+ ])
+
+ GRC_BUILD_CONDITIONAL(gr-wxgui)
])
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/grc_omnithread.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_omnithread.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_omnithread.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,39 +18,28 @@
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
- if test x$passed = xno; then
- AC_CONFIG_FILES([ \
- omnithread/Makefile \
- omnithread/gnuradio-omnithread.pc
- ])
- passed=yes
+ GRC_ENABLE(omnithread)
+
+ GRC_WITH(omnithread, [], gnuradio-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 != with; 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
+ ])
+
+ 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])
])
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/grc_usrp.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/grc_usrp.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -18,107 +18,45 @@
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
- if test x$passed = xno; then
- AC_CONFIG_FILES([ \
- usrp/Makefile \
- usrp/usrp.pc \
- usrp/usrp.iss \
- usrp/doc/Doxyfile \
- usrp/doc/Makefile \
- usrp/doc/other/Makefile \
- usrp/host/Makefile \
- usrp/host/misc/Makefile \
- usrp/host/lib/Makefile \
- usrp/host/lib/legacy/Makefile \
- usrp/host/lib/legacy/std_paths.h \
- usrp/host/swig/Makefile \
- usrp/host/apps/Makefile \
- usrp/firmware/Makefile \
- usrp/firmware/include/Makefile \
- usrp/firmware/lib/Makefile \
- usrp/firmware/src/Makefile \
- usrp/firmware/src/common/Makefile \
- usrp/firmware/src/usrp2/Makefile \
- usrp/fpga/Makefile \
- usrp/fpga/rbf/Makefile \
- ])
+ GRC_ENABLE(usrp)
- # gnulib.
- # FIXME: this needs to fail gracefully and continue, not implemented
yet
+ 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(${enable_usrp})
+
+ 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
- # These checks don't fail
+ 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])
- # There are 2 pkg-config files; the one for usrp requires omnithread
- # for Darwin only.
- case "$host_os" in
- darwin*)
- # for usrp.pc.in
- usrp_darwin_omnithread_pc_requires="gnuradio-omnithread"
- usrp_darwin_omnithread_pc_la="-lgromnithread"
- ;;
- *)
- # for usrp.pc.in (blanks)
- usrp_darwin_omnithread_pc_requires=""
- usrp_darwin_omnithread_pc_la=""
- ;;
- 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
- 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.])])
+ 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.])])
+ fi
+ if test $passed != with; then
+ 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"
@@ -126,10 +64,46 @@
usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la"
fi
- GRC_BUILD_CONDITIONAL([usrp])
+ dnl Include the usrp-inband INCLUDES and LA
+ AC_SUBST(usrp_inband_INCLUDES)
+ AC_SUBST(usrp_inband_LA)
- AC_SUBST(usrp_INCLUDES)
- AC_SUBST(usrp_LA)
+ 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_requires="gnuradio-omnithread"
+ ;;
+ *) dnl (blanks)
+ usrp_darwin_omnithread_pc_requires=""
+ ;;
+ esac
AC_SUBST(usrp_darwin_omnithread_pc_requires)
- AC_SUBST(usrp_darwin_omnithread_pc_la)
+
+ AC_CONFIG_FILES([ \
+ usrp/Makefile \
+ usrp/usrp.pc \
+ usrp/usrp.iss \
+ usrp/doc/Doxyfile \
+ usrp/doc/Makefile \
+ usrp/doc/other/Makefile \
+ usrp/host/Makefile \
+ usrp/host/misc/Makefile \
+ usrp/host/lib/Makefile \
+ usrp/host/lib/legacy/Makefile \
+ usrp/host/lib/legacy/std_paths.h \
+ usrp/host/swig/Makefile \
+ usrp/host/apps/Makefile \
+ usrp/firmware/Makefile \
+ usrp/firmware/include/Makefile \
+ usrp/firmware/lib/Makefile \
+ usrp/firmware/src/Makefile \
+ usrp/firmware/src/common/Makefile \
+ usrp/firmware/src/usrp2/Makefile \
+ usrp/fpga/Makefile \
+ usrp/fpga/rbf/Makefile \
+ ])
+
+ GRC_BUILD_CONDITIONAL(usrp)
])
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/pkg.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/pkg.m4 2008-03-05
19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/pkg.m4 2008-03-05
20:43:44 UTC (rev 7942)
@@ -1,68 +1,166 @@
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if,
action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
- succeeded=no
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <address@hidden>.
+#
+# 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 2 of the License, or
+# (at your option) any later version.
+#
+# 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.
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.18])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
- else
- dnl If PKG_CONFIG_PATH is not already set, add /usr/local/lib/pkgconfig.
- dnl If it's set, assume the user knows what they're doing.
- dnl This should help avoid failures while looking for fftw3f
- if test -z "$PKG_CONFIG_PATH"; then
- export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
- fi
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- AC_MSG_CHECKING($1_INCLUDEDIR)
- $1_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "$2"`
- AC_MSG_RESULT($$1_INCLUDEDIR)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+# E.g.,
+# PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if,
action-not)
+# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+# also defines GSTUFF_PKG_ERRORS on error
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+
+if test x$cross_compiling = xyes
+then
+ _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
+else
+ _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
+fi
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables
$1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"$2"`
fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- AC_SUBST($1_INCLUDEDIR)
- else
- echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig";
- fi
- fi
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider
adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
+$$1_PKG_ERRORS
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_fusb_tech.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_fusb_tech.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_fusb_tech.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -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
@@ -19,45 +19,56 @@
dnl Boston, MA 02110-1301, USA.
dnl
+# $1 is $enable_usrp:
+# yes : do these tests
+# no : do not do these tests
+# "" : do these tests
+
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"])
+ if test [x]$1 != xno; then
+ case "$cf_with_fusb_tech" in
+ 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_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])
+ AC_MSG_RESULT($FUSB_TECH)
+ AC_SUBST(FUSB_TECH)
+ fi
- 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 ;;
- *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_RESULT($FUSB_TECH)
- AC_SUBST(FUSB_TECH)
-
- AM_CONDITIONAL(FUSB_TECH_darwin, test $FUSB_TECH = darwin)
- AM_CONDITIONAL(FUSB_TECH_win32, test $FUSB_TECH = win32)
- AM_CONDITIONAL(FUSB_TECH_generic, test $FUSB_TECH = generic)
- AM_CONDITIONAL(FUSB_TECH_linux, test $FUSB_TECH = linux)
- AM_CONDITIONAL(FUSB_TECH_ra_wb, test $FUSB_TECH = ra_wb)
+ AM_CONDITIONAL(FUSB_TECH_darwin, test x$FUSB_TECH = xdarwin)
+ AM_CONDITIONAL(FUSB_TECH_win32, test x$FUSB_TECH = xwin32)
+ AM_CONDITIONAL(FUSB_TECH_generic, test x$FUSB_TECH = xgeneric)
+ AM_CONDITIONAL(FUSB_TECH_linux, test x$FUSB_TECH = xlinux)
+ AM_CONDITIONAL(FUSB_TECH_ra_wb, test x$FUSB_TECH = xra_wb)
])
-
Modified: gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_libusb.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_libusb.m4
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/config/usrp_libusb.m4
2008-03-05 20:43:44 UTC (rev 7942)
@@ -1,51 +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
+ ])
- 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/jcorgan/bc-merge/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/configure.ac 2008-03-05
19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/configure.ac 2008-03-05
20:43:44 UTC (rev 7942)
@@ -25,6 +25,22 @@
AM_INIT_AUTOMAKE(gnuradio,3.1.1)
AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
+if test x$cross_compiling != xno; then
+ AC_MSG_NOTICE([Configuring GNU Radio for cross compilation])
+else
+ AC_MSG_NOTICE([Configuring GNU Radio for native compilation])
+fi
+
+AM_INIT_AUTOMAKE(gnuradio,3.1svn)
+
+dnl add ${prefix}/lib/pkgconfig to the head of the PKG_CONFIG_PATH
+if test [x]${PKG_CONFIG_PATH} = x; then
+ PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
+else
+ PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
+fi
+export PKG_CONFIG_PATH
+
DEFINES=""
AC_SUBST(DEFINES)
@@ -51,8 +67,8 @@
if test "$GXX" = yes; then
case "$host_cpu" in
powerpc*)
- # "-O1" is broken on the PPC for some reason
- # (at least as of g++ 4.1.1)
+ dnl "-O1" is broken on the PPC for some reason
+ dnl (at least as of g++ 4.1.1)
swig_CXXFLAGS="-g1 -O2"
;;
*)
@@ -91,7 +107,6 @@
dnl check for threads (mandatory)
GR_OMNITHREAD
-#AC_SUBST(PTHREAD_CFLAGS)
CFLAGS="${CFLAGS} $PTHREAD_CFLAGS"
CXXFLAGS="${CXXFLAGS} $PTHREAD_CFLAGS"
@@ -184,6 +199,9 @@
AM_PATH_CPPUNIT([1.9.14],[],
[AC_MSG_ERROR([GNU Radio requires cppunit. Stop])])
+dnl see if GUILE is installed
+AC_PATH_PROG(GUILE,guile)
+
CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS
AC_SUBST(CPPUNIT_INCLUDES)
@@ -191,14 +209,29 @@
dnl defines BOOST_CFLAGS
GR_REQUIRE_BOOST_INCLUDES
-# If this is being done from a subversion tree, create variables
+dnl If this is being done from a subversion tree, create variables
GR_SUBVERSION
dnl Component specific configuration
dnl The order of the GR_ macros determines the order of compilation
+dnl For -any- checks on $enable_all_components
+dnl use the following guildlines:
+dnl yes : --enable-all-components was specified, so error out if any
+dnl components do not pass configuration checks.
+dnl no : --disable-all-components was specified, so try to build the
+dnl --enable'd components, and error out if any do not pass
+dnl configuration checks.
+dnl "" : this option was not specified on the command line; try to
+dnl build all components that are not --with'd, but don't
+dnl error out if any component does not pass configuration checks.
+dnl
+dnl For each --enable-foo component, if that flag is not specified on
+dnl the command line, the related variable $enable_foo will be set to
+dnl $enable_all_components .
+
AC_ARG_ENABLE(
[all-components],
- [ --enable-all-components Build all components or stop on failed
dependencies]
+ [ --enable-all-components Build all configurable components (default), or
stop on failed dependencies]
)
build_dirs="config"
@@ -223,7 +256,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/jcorgan/bc-merge/gnuradio-core/gnuradio-core.pc.in
===================================================================
---
gnuradio/branches/developers/jcorgan/bc-merge/gnuradio-core/gnuradio-core.pc.in
2008-03-05 19:34:50 UTC (rev 7941)
+++
gnuradio/branches/developers/jcorgan/bc-merge/gnuradio-core/gnuradio-core.pc.in
2008-03-05 20:43:44 UTC (rev 7942)
@@ -7,5 +7,5 @@
Description: GNU Software Radio toolkit
Requires: gnuradio-omnithread fftw3f
Version: @VERSION@
-Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@ -lgromnithread
-Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
+Libs: -L${libdir} -lgnuradio-core
+Cflags: -I${includedir} @DEFINES@
Modified: gnuradio/branches/developers/jcorgan/bc-merge/usrp/usrp.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/usrp/usrp.pc.in
2008-03-05 19:34:50 UTC (rev 7941)
+++ gnuradio/branches/developers/jcorgan/bc-merge/usrp/usrp.pc.in
2008-03-05 20:43:44 UTC (rev 7942)
@@ -7,5 +7,5 @@
Description: USRP Client Side C++ interface
Requires: libusb @usrp_darwin_omnithread_pc_requires@
Version: @VERSION@
-Libs: -L${libdir} -lusrp -lusb @usrp_darwin_omnithread_pc_la@
+Libs: -L${libdir} -lusrp
Cflags: -I${includedir} @DEFINES@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7942 - in gnuradio/branches/developers/jcorgan/bc-merge: . config gnuradio-core usrp,
jcorgan <=