Merge remote branch 'gnuradio/next'

* gnuradio/next: (806 commits)
  gruel: added missing ignores
  gruel: fixed swig interface file to dereference pmt_t.
  qtgui: fix distcheck error
  gruel: fixing structure. Passes make check.
  gruel: SWIGing Gruel into Python to access PMTs.
  gnuradio-examples: add C++ audio examples using new gr-audio
  created gruel/attributes.h to house compiler specific attribute macros
  audio: remove obsoleted individual top-level components
  gr-audio: added README and default config fix
  volk: simplify the get new method for the aligned pool
  grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
  grc: swap store the subprocess object rather than the pid when executing
  qtgui: removed python directory that was added, never used
  uhd: use %ignore to hide warnings and fix errors
  Added/updated ignore files.
  Fixing gr_filter_design program to import from gnuradio Python package.
  audio: high prio for platform specific audio osx
  audio: added windows and osx audio source files
  audio: added config checks for other audios, added jack and port
  audio: make prefs look like old audio, removed old audio.py
  ...

1 files changed, 33 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index 19d193172..73ebbd6af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
+dnl Copyright 2001-2011 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -19,6 +19,13 @@ dnl Boston, MA 02110-1301, USA.
 
 AC_INIT
 AC_PREREQ(2.57)
+
+dnl Set the prefix to the default when --prefix is not specified.
+dnl This is critical for variable substitutions in the configure.
+if test "${prefix}" = "NONE"; then
+    prefix=${ac_default_prefix}
+fi
+
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
 
@@ -141,7 +148,22 @@ AC_ARG_ENABLE([python],
    esac],
   [enable_python=yes]
 )
+
+# Allow user to choose whether to generate SWIG/Guile
+# Default is disabled
+AC_ARG_ENABLE([guile],
+  [AS_HELP_STRING([--enable-guile],
+    [generate SWIG/Guile components (default is no)])],
+  [case "${enableval}" in
+     yes) enable_guile=yes ;;
+     no) enable_guile=no ;;
+     *) AC_MSG_ERROR([bad value ${enableval} for --enable-guile]) ;;
+   esac],
+  [enable_guile=no]
+)
+
 AM_CONDITIONAL([PYTHON], [test x$enable_python = xyes])
+AM_CONDITIONAL([GUILE], [test x$enable_guile = xyes])
 
 AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
 AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
@@ -197,20 +219,11 @@ AC_CHECK_LIB(m, sincos, [AC_DEFINE([HAVE_SINCOS],[1],[Define to 1 if your system
 AC_CHECK_LIB(m, sincosf,[AC_DEFINE([HAVE_SINCOSF],[1],[Define to 1 if your system has `sincosf'.])])
 AC_CHECK_LIB(m, sinf, [AC_DEFINE([HAVE_SINF],[1],[Define to 1 if your system has `sinf'.])])
 AC_CHECK_LIB(m, cosf, [AC_DEFINE([HAVE_COSF],[1],[Define to 1 if your system has `cosf'.])])
-AC_CHECK_LIB(m, trunc, [AC_DEFINE([HAVE_TRUNC],[1],[Define to 1 if your system has `trunc'.])])
 AC_CHECK_LIB(m, exp10, [AC_DEFINE([HAVE_EXP10],[1],[Define to 1 if your system has 'exp10'.])])
 AC_CHECK_LIB(m, log2, [AC_DEFINE([HAVE_LOG2],[1],[Define to 1 if your system has 'log2'.])])
 #AC_FUNC_MKTIME
 
 AH_BOTTOM([
-#ifndef HAVE_TRUNC
-#include <math.h>
-inline static double trunc(double x)
-{
-  return x >= 0 ? floor(x) : ceil(x);
-}
-#endif
-
 #ifndef HAVE_EXP10
 #include <math.h>
 inline static double exp10(double x)
@@ -254,7 +267,7 @@ CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS
 AC_SUBST(CPPUNIT_INCLUDES)
 
 dnl see if GUILE is installed
-AC_PATH_PROG(GUILE,guile)
+dnl AC_PATH_PROG(GUILE,guile)
 
 dnl
 dnl We require the boost headers, thread lib and date_time lib.
@@ -282,13 +295,13 @@ dnl
 dnl all the rest of these call AC_SUBST(BOOST_<foo>_LIB) and define HAVE_BOOST_<foo>
 dnl
 AX_BOOST_DATE_TIME
-dnl AX_BOOST_FILESYSTEM
+AX_BOOST_FILESYSTEM
 dnl AX_BOOST_IOSTREAMS
 AX_BOOST_PROGRAM_OPTIONS
 dnl AX_BOOST_REGEX
 dnl AX_BOOST_SERIALIZATION
 dnl AX_BOOST_SIGNALS
-dnl AX_BOOST_SYSTEM
+AX_BOOST_SYSTEM
 dnl AX_BOOST_TEST_EXEC_MONITOR
 dnl AX_BOOST_UNIT_TEST_FRAMEWORK
 dnl AX_BOOST_WSERIALIZATION
@@ -336,6 +349,7 @@ AC_ARG_ENABLE(
 
 build_dirs="config"
 GRC_GRUEL                       dnl must come first
+GRC_VOLK
 GRC_GCELL
 GRC_GNURADIO_CORE
 GRC_USRP
@@ -344,12 +358,7 @@ GRC_GR_USRP			dnl this must come after GRC_USRP
 GRC_GR_USRP2
 GRC_GR_GCELL			dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE
 GRC_GR_MSDD6000	
-GRC_GR_AUDIO_ALSA
-GRC_GR_AUDIO_JACK
-GRC_GR_AUDIO_OSS
-GRC_GR_AUDIO_OSX
-GRC_GR_AUDIO_PORTAUDIO
-GRC_GR_AUDIO_WINDOWS
+GRC_GR_AUDIO
 GRC_GR_ATSC
 GRC_GR_COMEDI
 GRC_GR_CVSD_VOCODER
@@ -364,9 +373,10 @@ GRC_GR_VIDEO_SDL
 GRC_GR_WXGUI
 GRC_GR_QTGUI
 GRC_GR_SOUNDER			dnl this must come after GRC_USRP
-GRC_GR_UTILS                   dnl this must come after GRC_GR_WXGUI
+GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
 GRC_GNURADIO_EXAMPLES		dnl must come after all GRC_GR_*
 GRC_GRC
+GRC_GR_UHD
 GRC_DOCS			dnl must be last
 
 # Each component is now either to be built, was skipped, will be
@@ -389,12 +399,14 @@ AC_SUBST(with_SWIG_INCLUDES)
 AC_SUBST(with_PYDIRPATH)
 AC_SUBST(with_SWIGDIRPATH)
 AC_SUBST(with_LIBDIRPATH)
+AC_SUBST(with_GUILE_LOAD_PATH)
 
 # Local files tweaked by AC
 AC_CONFIG_FILES([\
     Makefile \
     run_tests.sh \
-    config/Makefile \
+    setup_guile_test_env \
+    config/Makefile
 ])
 
 dnl run_tests.sh is created from run_tests.sh.in .  Make it executable.