Merge branch 'next' into guile.

Passes distcheck.

* next: (32 commits)
  volk: Fix for popcnt's 64/32-bit issues.
  Using a copy of config.guess and config.sub instead of sym links.
  Including time header to qa files.
  Changed python env variable to more globally usable version.
  gr_uhd: Quick fix for make distcheck failures if UHD is not installed.
  PFB resampler: fix it this way to avoid the signed/unsigned warning.
  PFB resampler: fixes bug where filter could be looking past the number of inputs.
  resampler PFB: Sets relative rate when rate is changed.
  Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC.
  volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags.
  volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit.
  volk: May be a hack, but it was required for my 32-bit Fedora 13 to work.
  volk: Removing unnecessary shell script; last commit takes care if its functions.
  volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script.
  volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error.
  volk: Adding a few more generic-only test cases.
  volk: adding generic QA test for 16sc_magnitude_32f.
  volk: modified the configure scripts to output which architectures it will be building based on the configure tests.
  uhd: update notes in grc blocks for addressing scheme
  volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps).
  ...

1 files changed, 118 insertions, 0 deletions

diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4
new file mode 100644
index 000000000..c7a5fe960
--- /dev/null
+++ b/volk/config/lv_configure.m4
@@ -0,0 +1,118 @@
+dnl
+dnl Copyright 2010 Free Software Foundation, Inc.
+dnl
+dnl This program 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 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
+
+dnl LV_CONFIGURE
+dnl
+dnl Handles the bulk of the configure.ac work for an out-of-tree build
+dnl
+dnl You must invoke:
+dnl
+dnl   AC_INIT(package_name,version)
+dnl   AC_PREREQ(2.57)
+dnl   AC_CONFIG_AUX_DIR([.])	
+dnl
+dnl in configure.ac before LV_CONFIGURE
+dnl
+dnl
+dnl N.B., this is an m4_define because if it were an AC_DEFUN it would
+dnl get called too late to be useful.
+
+m4_define([LV_CONFIGURE],
+[
+  #AC_CANONICAL_BUILD
+  #AC_CANONICAL_HOST
+  #AC_CANONICAL_TARGET
+
+  LF_CONFIGURE_CC
+  LF_CONFIGURE_CXX
+  GR_LIB64		dnl check for lib64 suffix after choosing compilers
+
+  LV_GCC_VERSION_WORKAROUND
+  dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the PKG_CONFIG_PATH
+  if test x${PKG_CONFIG_PATH} = x; then
+      PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig
+  else
+      PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig:${PKG_CONFIG_PATH}
+  fi
+  export PKG_CONFIG_PATH
+
+  LF_SET_WARNINGS
+dnl  GR_SET_GPROF
+dnl  GR_SET_PROF
+  AM_PROG_AS
+  AC_PROG_LN_S
+  AC_PROG_MAKE_SET
+  AC_PROG_INSTALL
+  AC_PATH_PROG([RM_PROG], [rm])
+
+  AC_LIBTOOL_WIN32_DLL
+  AC_ENABLE_SHARED	dnl do build shared libraries... important for qa
+  AC_DISABLE_STATIC	dnl don't build static libraries... important for qa
+  m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL])
+  dnl GR_FORTRAN
+
+  GR_NO_UNDEFINED	dnl do we need the -no-undefined linker flag
+dnl  GR_SCRIPTING		dnl Locate python, SWIG, etc
+
+dnl  AC_ARG_WITH([python],
+dnl    AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]),
+dnl    [case "$with_python" in
+dnl      (no | yes) ;;
+dnl      (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;;
+dnl     esac],
+dnl    [with_python=yes])
+
+dnl  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
+
+
+  dnl Set the c++ compiler that we use for the build system when cross compiling
+  if test "x$CXX_FOR_BUILD" = x
+  then
+    CXX_FOR_BUILD=${CXX}
+  fi
+  AC_SUBST(CXX_FOR_BUILD)
+
+  dnl Checks for header files.
+  AC_HEADER_STDC
+
+  dnl Checks for typedefs, structures, and compiler characteristics.
+  AC_C_CONST
+  AC_C_INLINE
+  AC_TYPE_SIZE_T
+  AC_HEADER_TIME
+  AC_C_BIGENDIAN
+
+  dnl Check for Mingw support
+  GR_PWIN32
+  GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS
+  
+  LDFLAGS="$LDFLAGS $LIBGNURADIO_CORE_EXTRA_LDFLAGS"
+
+  AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
+  AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
+
+  dnl Define where to look for cppunit includes and libs
+  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
+  dnl Try using pkg-config first, then fall back to cppunit-config.
+  PKG_CHECK_EXISTS(cppunit,
+    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
+    [AM_PATH_CPPUNIT([1.9.14],[],
+		     [AC_MSG_ERROR([VOLK requires cppunit.  Stop])])])
+
+dnl  PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
+dnl  LIBS="$LIBS $GNURADIO_CORE_LIBS"
+])