[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7873 - in gnuradio/branches/developers/michaelld/bc_b
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r7873 - in gnuradio/branches/developers/michaelld/bc_behavior: . config |
|
Date: |
Thu, 28 Feb 2008 18:15:00 -0700 (MST) |
Author: michaelld
Date: 2008-02-28 18:14:59 -0700 (Thu, 28 Feb 2008)
New Revision: 7873
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/configure.ac
Log:
Revert back some code changes, to allow for "make dist[check]" no
matter the 'configure' options (hopefully).
Cleaned up the use of AC_SUBST on already included variables.
Fixed --enable code to work as it did before.
Modified: gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_build.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -25,6 +25,7 @@
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],
@@ -37,6 +38,22 @@
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
@@ -120,7 +137,7 @@
PKG_CHECK_EXISTS($2, passed=with, passed=no)
fi
fi
- if test x$passed != xwith; then
+ 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
@@ -166,8 +183,16 @@
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 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.])
@@ -185,7 +210,6 @@
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 x"$GUILE" = x; then
AC_MSG_RESULT([Component $1 requires guile, which was not found.])
passed=no
@@ -221,14 +245,14 @@
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 $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($3, INCLUDES, " ")
GRC_ADD_TO_LIST($3, SWIG_INCLUDES, " ")
@@ -249,15 +273,15 @@
fi
fi
fi
- if test x$passed = xno; then
+ if test $passed = no; then
skipped_dirs="$skipped_dirs $1"
$3[_skipped]=yes
else
- AC_SUBST($3[_INCLUDES])
- AC_SUBST($3[_LA])
- AC_SUBST($3[_INCLUDEDIR])
- AC_SUBST($3[_LIBDIRPATH])
- AC_SUBST($3[_LDFLAG])
$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/michaelld/bc_behavior/config/grc_gnuradio_core.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_core.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -35,7 +35,7 @@
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
+ 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 \
@@ -56,6 +56,15 @@
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"
+
+ 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
+ ])
fi
dnl other externally-required gnuradio-core variables
@@ -63,51 +72,42 @@
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 \
- 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/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_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/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 \
+ ])
+ 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([run_tests_core],[chmod +x
gnuradio-core/src/python/gnuradio/gr/run_tests])
])
])
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-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gnuradio_examples.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,23 +23,23 @@
dnl Do not do gnuradio-examples if gnuradio-core skipped
GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core)
- 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 \
- ])
+ 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 \
])
+
+ GRC_BUILD_CONDITIONAL(gnuradio-examples)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_atsc.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,16 +23,16 @@
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 \
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_alsa.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -33,15 +33,13 @@
[passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not
found.])])
fi
- GRC_BUILD_CONDITIONAL(gr-audio-alsa,[
- AC_CONFIG_FILES([ \
- gr-audio-alsa/Makefile \
- gr-audio-alsa/src/Makefile \
- gr-audio-alsa/src/run_tests \
- ])
+ AC_CONFIG_FILES([ \
+ gr-audio-alsa/Makefile \
+ gr-audio-alsa/src/Makefile \
+ gr-audio-alsa/src/run_tests \
+ ])
- 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/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_jack.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -33,15 +33,13 @@
[passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not
found.])])
fi
- GRC_BUILD_CONDITIONAL(gr-audio-jack,[
- AC_CONFIG_FILES([ \
- gr-audio-jack/Makefile \
- gr-audio-jack/src/Makefile \
- gr-audio-jack/src/run_tests \
- ])
+ AC_CONFIG_FILES([ \
+ gr-audio-jack/Makefile \
+ gr-audio-jack/src/Makefile \
+ gr-audio-jack/src/run_tests \
+ ])
- 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/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_oss.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -35,6 +35,7 @@
[passed=no;AC_MSG_RESULT([gr-audio-oss requires library
ossaudio, not found.])])
if test $passed != no; then
OSS_LIBS=-lossaudio
+ AC_SUBST(OSS_LIBS)
AC_MSG_RESULT([Using OSS library $OSS_LIBS])
fi
;;
@@ -48,15 +49,13 @@
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_CONFIG_FILES([ \
+ gr-audio-oss/Makefile \
+ gr-audio-oss/src/Makefile \
+ gr-audio-oss/src/run_tests \
+ ])
- AC_SUBST(OSS_LIBS)
-
+ 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/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_osx.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -41,13 +41,13 @@
esac
fi
+ AC_CONFIG_FILES([ \
+ gr-audio-osx/Makefile \
+ gr-audio-osx/src/Makefile \
+ gr-audio-osx/src/run_tests \
+ ])
+
GRC_BUILD_CONDITIONAL(gr-audio-osx,[
- 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-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_portaudio.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -33,15 +33,13 @@
[passed=no;AC_MSG_RESULT([gr-audio-portaudio requires package
portaudio, not found.])])
fi
- GRC_BUILD_CONDITIONAL(gr-audio-portaudio,[
- AC_CONFIG_FILES([ \
- gr-audio-portaudio/Makefile \
- gr-audio-portaudio/src/Makefile \
- gr-audio-portaudio/src/run_tests \
- ])
+ AC_CONFIG_FILES([ \
+ gr-audio-portaudio/Makefile \
+ gr-audio-portaudio/src/Makefile \
+ gr-audio-portaudio/src/run_tests \
+ ])
- 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/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_audio_windows.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -41,16 +41,15 @@
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 \
- ])
+ AC_CONFIG_FILES([ \
+ gr-audio-windows/Makefile \
+ gr-audio-windows/src/Makefile \
+ gr-audio-windows/src/run_tests \
+ ])
+ GRC_BUILD_CONDITIONAL(gr-audio-windows,[
WINAUDIO_LIBS=-lwinmm
- AC_SUBST(WINAUDIO_LIBS)
-
+ 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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_comedi.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -33,15 +33,13 @@
[passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not
found.])])
fi
- GRC_BUILD_CONDITIONAL(gr-comedi,[
- AC_CONFIG_FILES([ \
- gr-comedi/Makefile \
- gr-comedi/src/Makefile \
- gr-comedi/src/run_tests \
- ])
+ AC_CONFIG_FILES([ \
+ gr-comedi/Makefile \
+ gr-comedi/src/Makefile \
+ gr-comedi/src/run_tests \
+ ])
- 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/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_cvsd_vocoder.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,15 +23,15 @@
dnl Don't do gr-cvsd-vocoder if gnuradio-core skipped
GRC_CHECK_DEPENDENCY(gr-cvsd-vocoder, gnuradio-core)
+ 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 \
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gpio.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,19 +23,19 @@
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
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_gsm_fr_vocoder.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,16 +23,16 @@
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 \
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_pager.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,13 +23,13 @@
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
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_qtgui.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -37,11 +37,11 @@
GR_QWT([], [passed=no])
fi
- GRC_BUILD_CONDITIONAL(gr-qtgui, [
- AC_CONFIG_FILES([ \
- gr-qtgui/Makefile \
- gr-qtgui/src/Makefile \
- gr-qtgui/src/lib/Makefile \
- ])
+ AC_CONFIG_FILES([ \
+ gr-qtgui/Makefile \
+ gr-qtgui/src/Makefile \
+ gr-qtgui/src/lib/Makefile \
])
+
+ GRC_BUILD_CONDITIONAL(gr-qtgui)
])
Modified:
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
===================================================================
---
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radar_mono.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -24,21 +24,21 @@
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
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_radio_astronomy.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,15 +23,15 @@
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 \
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_sounder.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -24,20 +24,20 @@
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
+ ])
+
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
- ])
-
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_trellis.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -23,18 +23,18 @@
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
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_usrp.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -24,13 +24,13 @@
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 \
+ ])
+
GRC_BUILD_CONDITIONAL(gr-usrp,[
- AC_CONFIG_FILES([ \
- gr-usrp/Makefile \
- gr-usrp/src/Makefile \
- gr-usrp/src/run_tests \
- ])
-
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_utils.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -25,12 +25,12 @@
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 \
- ])
+ AC_CONFIG_FILES([ \
+ gr-utils/Makefile \
+ gr-utils/src/Makefile \
+ gr-utils/src/lib/Makefile \
+ gr-utils/src/python/Makefile \
])
+
+ 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-28 23:44:56 UTC (rev 7872)
+++
gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_video_sdl.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -29,21 +29,19 @@
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.])])
+ 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
- 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_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)
-
+ 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/michaelld/bc_behavior/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_gr_wxgui.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -36,12 +36,12 @@
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 \
- ])
+ 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/michaelld/bc_behavior/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_mblock.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -33,23 +33,24 @@
if test $passed = yes; then
dnl Don't do mblock if guile not available
GRC_CHECK_GUILE(mblock)
-
+ fi
+ if test $passed != with; then
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
+ AC_CONFIG_FILES([\
+ mblock/Makefile \
+ mblock/mblock.pc \
+ mblock/doc/Makefile \
+ mblock/src/Makefile \
+ mblock/src/lib/Makefile \
+ mblock/src/scheme/Makefile \
+ mblock/src/scheme/gnuradio/Makefile \
+ ])
+
GRC_BUILD_CONDITIONAL(mblock,[
- AC_CONFIG_FILES([\
- mblock/Makefile \
- mblock/mblock.pc \
- mblock/doc/Makefile \
- mblock/src/Makefile \
- mblock/src/lib/Makefile \
- mblock/src/scheme/Makefile \
- mblock/src/scheme/gnuradio/Makefile \
- ])
-
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_omnithread.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -26,19 +26,19 @@
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
+ 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
+ AC_CONFIG_FILES([ \
+ omnithread/Makefile \
+ omnithread/gnuradio-omnithread.pc
+ ])
+
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_pmt.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -31,23 +31,24 @@
if test $passed = yes; then
dnl Don't do pmt if guile not available
GRC_CHECK_GUILE(pmt)
-
+ fi
+ if test $passed != with; then
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
+ AC_CONFIG_FILES([\
+ pmt/Makefile \
+ pmt/pmt.pc \
+ pmt/doc/Makefile \
+ pmt/src/Makefile \
+ pmt/src/lib/Makefile \
+ pmt/src/scheme/Makefile \
+ pmt/src/scheme/gnuradio/Makefile \
+ ])
+
GRC_BUILD_CONDITIONAL(pmt,[
- AC_CONFIG_FILES([\
- pmt/Makefile \
- pmt/pmt.pc \
- pmt/doc/Makefile \
- pmt/src/Makefile \
- pmt/src/lib/Makefile \
- pmt/src/scheme/Makefile \
- pmt/src/scheme/gnuradio/Makefile \
- ])
-
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-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/grc_usrp.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -29,10 +29,8 @@
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
+ USRP_SET_FUSB_TECHNIQUE(${enable_usrp})
-### ([], [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
@@ -56,7 +54,8 @@
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"
@@ -69,35 +68,6 @@
AC_SUBST(usrp_inband_INCLUDES)
AC_SUBST(usrp_inband_LA)
- GRC_BUILD_CONDITIONAL(usrp,[
- AC_CONFIG_FILES([ \
- usrp/Makefile \
- usrp/usrp.pc \
- usrp/usrp-inband.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/inband/Makefile \
- usrp/host/lib/legacy/Makefile \
- usrp/host/lib/legacy/std_paths.h \
- usrp/host/swig/Makefile \
- usrp/host/apps/Makefile \
- usrp/host/apps-inband/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 \
- ])
- ])
-
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.
@@ -110,4 +80,33 @@
;;
esac
AC_SUBST(usrp_darwin_omnithread_pc_requires)
+
+ AC_CONFIG_FILES([ \
+ usrp/Makefile \
+ usrp/usrp.pc \
+ usrp/usrp-inband.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/inband/Makefile \
+ usrp/host/lib/legacy/Makefile \
+ usrp/host/lib/legacy/std_paths.h \
+ usrp/host/swig/Makefile \
+ usrp/host/apps/Makefile \
+ usrp/host/apps-inband/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/michaelld/bc_behavior/config/usrp_fusb_tech.m4
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
2008-02-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/config/usrp_fusb_tech.m4
2008-02-29 01:14:59 UTC (rev 7873)
@@ -19,51 +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],
AC_HELP_STRING([--with-fusb-tech=OS],
[Set fast USB technique (default=auto)]),
[cf_with_fusb_tech="$withval"],
[cf_with_fusb_tech="$host_os"])
-
- 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
+ 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
- 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
+ ;;
+ esac
- AC_MSG_CHECKING([for fast usb technique to use])
- AC_MSG_RESULT($FUSB_TECH)
- AC_SUBST(FUSB_TECH)
+ AC_MSG_CHECKING([for fast usb technique to use])
+ AC_MSG_RESULT($FUSB_TECH)
+ AC_SUBST(FUSB_TECH)
+ fi
- 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/michaelld/bc_behavior/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
2008-02-28 23:44:56 UTC (rev 7872)
+++ gnuradio/branches/developers/michaelld/bc_behavior/configure.ac
2008-02-29 01:14:59 UTC (rev 7873)
@@ -67,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"
;;
*)
@@ -107,7 +107,6 @@
dnl check for threads (mandatory)
GR_OMNITHREAD
-#AC_SUBST(PTHREAD_CFLAGS)
CFLAGS="${CFLAGS} $PTHREAD_CFLAGS"
CXXFLAGS="${CXXFLAGS} $PTHREAD_CFLAGS"
@@ -208,6 +207,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)
@@ -215,7 +217,7 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7873 - in gnuradio/branches/developers/michaelld/bc_behavior: . config,
michaelld <=