summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.am5
-rw-r--r--config/gr_omnithread.m452
-rw-r--r--config/gr_set_md_cpu.m430
-rw-r--r--config/gr_version.m419
-rw-r--r--config/grc_gcell.m45
-rw-r--r--config/grc_gr_audio_osx.m45
-rw-r--r--config/grc_gr_audio_portaudio.m41
-rw-r--r--config/grc_gr_noaa.m41
-rw-r--r--config/grc_gr_pager.m412
-rw-r--r--config/grc_gr_vrt.m438
-rw-r--r--config/grc_mblock.m459
-rw-r--r--config/grc_omnithread.m446
-rw-r--r--config/grc_usrp.m416
-rw-r--r--config/grc_usrp2.m45
-rwxr-xr-xconfig/usrp_libusb.m413
15 files changed, 62 insertions, 245 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index eb1056eb6..959b8f014 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009,2010 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -68,9 +68,7 @@ m4macros = \
grc_gr_trellis.m4 \
grc_gr_usrp.m4 \
grc_gr_video_sdl.m4 \
- grc_gr_vrt.m4 \
grc_gr_wxgui.m4 \
- grc_mblock.m4 \
grc_gruel.m4 \
grc_vrt.m4 \
gr_check_createfilemapping.m4 \
@@ -88,7 +86,6 @@ m4macros = \
gr_lib64.m4 \
gr_libgnuradio_core_extra_ldflags.m4 \
gr_no_undefined.m4 \
- gr_omnithread.m4 \
gr_pwin32.m4 \
gr_python.m4 \
gr_require_mc4020.m4 \
diff --git a/config/gr_omnithread.m4 b/config/gr_omnithread.m4
deleted file mode 100644
index 054f07824..000000000
--- a/config/gr_omnithread.m4
+++ /dev/null
@@ -1,52 +0,0 @@
-# Check for Omnithread (pthread/NT) thread support. -*- Autoconf -*-
-
-# Copyright 2003,2007 Free Software Foundation, Inc.
-
-# 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.
-
-# 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., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([GR_OMNITHREAD],
-[
- # Check first for POSIX
- ACX_PTHREAD(
- [ AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.])
- ot_posix="yes"
- DEFINES="$DEFINES -DOMNITHREAD_POSIX=1"
- ],[
- # If no POSIX support found, then check for NT threads
- AC_MSG_CHECKING([for NT threads])
-
- AC_LINK_IFELSE([
- #include <windows.h>
- #include <winbase.h>
- int main() { InitializeCriticalSection(NULL); return 0; }
- ],
- [
- ot_nt="yes"
- DEFINES="$DEFINES -DOMNITHREAD_NT=1"
- ],
- [AC_MSG_FAILURE([GNU Radio requires POSIX threads. pthreads not found.])]
- )
- AC_MSG_RESULT(yes)
- ])
- AM_CONDITIONAL(OMNITHREAD_POSIX, test "x$ot_posix" = xyes)
- AM_CONDITIONAL(OMNITHREAD_NT, test "x$ot_nt" = xyes)
-
- save_LIBS="$LIBS"
- AC_SEARCH_LIBS([clock_gettime], [rt], [PTHREAD_LIBS="$PTHREAD_LIBS $LIBS"])
- AC_CHECK_FUNCS([clock_gettime gettimeofday nanosleep])
- LIBS="$save_LIBS"
-])
-
diff --git a/config/gr_set_md_cpu.m4 b/config/gr_set_md_cpu.m4
index d8714c4a7..cb5fb5aac 100644
--- a/config/gr_set_md_cpu.m4
+++ b/config/gr_set_md_cpu.m4
@@ -50,13 +50,37 @@ AC_DEFUN([GR_SET_MD_CPU],[
AC_ARG_WITH(md-cpu,
AC_HELP_STRING([--with-md-cpu=ARCH],[set machine dependent speedups (auto)]),
[cf_with_md_cpu="$withval"],
- [cf_with_md_cpu="$host_cpu"])
-
+ [
+ dnl see if the user has specified --host or --build, via 'cross_compiling'
+ if test "$cross_compiling" != no; then
+ dnl when cross-compiling, because the user specified it either via
+ dnl --target or --build, just keep the user's specs & hope for the best.
+ cf_with_md_cpu="$host_cpu"
+ else
+ dnl when the user didn't specify --target or --build, on Darwin 10
+ dnl (OSX 10.6.0 and .1) and GNU libtoool 2.2.6, 'configure' doesn't
+ dnl figure out the CPU type correctly, so do it by hand here using
+ dnl the sizeof (void*): if 4 then use i386, and otherwise use x86_64.
+ case "$host_os" in
+ *darwin*10*)
+ AC_CHECK_SIZEOF(void*)
+ if test "$ac_cv_sizeof_voidp" = 4; then
+ cf_with_md_cpu="i386"
+ else
+ cf_with_md_cpu="x86_64"
+ fi
+ ;;
+ *)
+ cf_with_md_cpu="$host_cpu"
+ ;;
+ esac
+ fi
+ ])
case "$cf_with_md_cpu" in
x86 | i[[3-7]]86) MD_CPU=x86 MD_SUBCPU=x86 ;;
x86_64) MD_CPU=x86 MD_SUBCPU=x86_64 ;;
powerpc*) MD_CPU=powerpc ;;
- arm)
+ arm*)
_FIND_ARM_ISA
if test $is_armv5 = yes; then MD_CPU=armv5;
elif test $is_armv7_a = yes; then MD_CPU=armv7_a;
diff --git a/config/gr_version.m4 b/config/gr_version.m4
index 3360b7d54..489f78034 100644
--- a/config/gr_version.m4
+++ b/config/gr_version.m4
@@ -25,7 +25,7 @@ AC_DEFUN([GR_VERSION],[
dnl
dnl MAJOR_VERSION Major release generation (2.x, 3.x, etc.)
dnl API_COMPAT API compatibility version (3.2.x, 3.3.x, etc.)
- dnl MINOR_VERSION Minor release version
+ dnl MINOR_VERSION Minor release version (3.3.0, 3.3.1, etc.)
dnl MAINT_VERSION Pure bugfix additions to make maintenance release
dnl
dnl The last two fields can have 'git' instead of a number to indicate
@@ -53,18 +53,13 @@ AC_DEFUN([GR_VERSION],[
RELEASE=$RELEASE-$GIT_VERSION
fi
else
- dnl This is a numbered reelase.
- dnl Test if minor version is 0, which we don't encode, unless it is also
- dnl a maintenance release
- if test "$MINOR_VERSION" != "0" -o "$MAINT_VERSION" != "0"; then
- dnl 3.3.1
- RELEASE=$RELEASE.$MINOR_VERSION
- if test "$MAINT_VERSION" != "0"; then
- dnl 3.3.0.1, 3.3.1.1
- RELEASE=$RELEASE.$MAINT_VERSION
- fi
- DOCVER=$RELEASE
+ dnl This is a numbered release.
+ RELEASE=$RELEASE.$MINOR_VERSION
+ if test "$MAINT_VERSION" != "0"; then
+ RELEASE=$RELEASE.$MAINT_VERSION
fi
+
+ DOCVER=$RELEASE
fi
fi
diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4
index ff289d1ae..b94deb4db 100644
--- a/config/grc_gcell.m4
+++ b/config/grc_gcell.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -21,9 +21,6 @@ AC_DEFUN([GRC_GCELL],[
GRC_ENABLE(gcell)
dnl GRC_WITH(gcell)
- dnl Don't do gcell if omnithread skipped
- GRC_CHECK_DEPENDENCY(gcell, 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
diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4
index 95fbc17d5..df8634ff6 100644
--- a/config/grc_gr_audio_osx.m4
+++ b/config/grc_gr_audio_osx.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -20,8 +20,7 @@ dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_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)
+ dnl Don't do gr-audio-osx if gnuradio-core skipped
GRC_CHECK_DEPENDENCY(gr-audio-osx, gnuradio-core)
dnl If execution gets to here, $passed will be:
diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4
index 08d71f8fb..ff551b38a 100644
--- a/config/grc_gr_audio_portaudio.m4
+++ b/config/grc_gr_audio_portaudio.m4
@@ -22,7 +22,6 @@ AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
dnl Don't do gr-audio-portaudio if gnuradio-core skipped
GRC_CHECK_DEPENDENCY(gr-audio-portaudio, gnuradio-core)
- GRC_CHECK_DEPENDENCY(gr-audio-portaudio, omnithread)
dnl If execution gets to here, $passed will be:
dnl with : if the --with code didn't error out
diff --git a/config/grc_gr_noaa.m4 b/config/grc_gr_noaa.m4
index b00579ff5..69d0aad55 100644
--- a/config/grc_gr_noaa.m4
+++ b/config/grc_gr_noaa.m4
@@ -30,6 +30,7 @@ AC_DEFUN([GRC_GR_NOAA],[
gr-noaa/apps/Makefile \
gr-noaa/grc/Makefile \
gr-noaa/lib/Makefile \
+ gr-noaa/oct/Makefile \
gr-noaa/python/Makefile \
gr-noaa/swig/Makefile \
])
diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4
index 23af7a9c4..cdd6177af 100644
--- a/config/grc_gr_pager.m4
+++ b/config/grc_gr_pager.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2006,2008,2009 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -26,12 +26,16 @@ AC_DEFUN([GRC_GR_PAGER],[
AC_CONFIG_FILES([\
gr-pager/Makefile \
gr-pager/gnuradio-pager.pc \
- gr-pager/src/Makefile \
- gr-pager/src/run_tests
+ gr-pager/apps/Makefile \
+ gr-pager/grc/Makefile \
+ gr-pager/lib/Makefile \
+ gr-pager/python/Makefile \
+ gr-pager/python/run_tests \
+ gr-pager/swig/Makefile \
])
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])
+ AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/python/run_tests])
])
])
diff --git a/config/grc_gr_vrt.m4 b/config/grc_gr_vrt.m4
deleted file mode 100644
index ff2d06347..000000000
--- a/config/grc_gr_vrt.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright 2008,2009 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_GR_VRT],[
- GRC_ENABLE(gr-vrt)
-
- dnl Don't do gr-usrp if gnuradio-core or vrt skipped
- GRC_CHECK_DEPENDENCY(gr-vrt, vrt)
- GRC_CHECK_DEPENDENCY(gr-vrt, gnuradio-core)
-
- AC_CONFIG_FILES([ \
- gr-vrt/Makefile \
- gr-vrt/gnuradio-vrt.pc \
- gr-vrt/src/Makefile \
- gr-vrt/src/run_tests \
- ])
-
- GRC_BUILD_CONDITIONAL(gr-vrt,[
- dnl run_tests is created from run_tests.in. Make it executable.
- AC_CONFIG_COMMANDS([run_tests_vrt], [chmod +x gr-vrt/src/run_tests])
- ])
-])
diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4
deleted file mode 100644
index e3ae1817f..000000000
--- a/config/grc_mblock.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-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_MBLOCK],[
- GRC_ENABLE(mblock)
-
- GRC_WITH(mblock)
-
- dnl Don't do mblock if omnithread or pmt skipped
- GRC_CHECK_DEPENDENCY(mblock, pmt)
- GRC_CHECK_DEPENDENCY(mblock, omnithread)
-
- dnl If execution gets to here, $passed will be:
- dnl with : if the --with code didn't error out
- dnl yes : if the --enable code passed muster and all dependencies are met
- dnl no : otherwise
- if test $passed = yes; then
- dnl Don't do mblock if guile not available
- GRC_CHECK_GUILE(mblock)
- fi
- if test $passed != with; then
- dnl how and where to find INCLUDES and LA
- mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
- 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/include/Makefile \
- mblock/src/include/mblock/Makefile \
- mblock/src/lib/Makefile \
- mblock/src/scheme/Makefile \
- mblock/src/scheme/gnuradio/Makefile \
- ])
-
- GRC_BUILD_CONDITIONAL(mblock,[
- dnl run_tests is created from run_tests.in. Make it executable.
- dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x mblock/src/python/run_tests])
- ])
-])
diff --git a/config/grc_omnithread.m4 b/config/grc_omnithread.m4
deleted file mode 100644
index 1bcedebe1..000000000
--- a/config/grc_omnithread.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,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_OMNITHREAD],[
- 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
-
- AC_CONFIG_FILES([ \
- omnithread/Makefile \
- omnithread/gnuradio/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])
- ])
-])
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 286641928..999b9c5c3 100644
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -22,8 +22,8 @@ AC_DEFUN([GRC_USRP],[
GRC_WITH(usrp)
- dnl Don't do usrp if omnithread skipped
- GRC_CHECK_DEPENDENCY(usrp, omnithread)
+ dnl Don't do usrp if gruel is skipped
+ GRC_CHECK_DEPENDENCY(usrp, gruel)
dnl Make sure the fast usb technique is set, OS dependent.
dnl This is always performed, since it puts out CLI flags.
@@ -59,18 +59,6 @@ AC_DEFUN([GRC_USRP],[
usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la"
fi
- dnl There pkg-config file 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_CONFIG_FILES([ \
usrp/Makefile \
usrp/usrp.pc \
diff --git a/config/grc_usrp2.m4 b/config/grc_usrp2.m4
index f7064c916..701b100ad 100644
--- a/config/grc_usrp2.m4
+++ b/config/grc_usrp2.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008,2010 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -23,9 +23,8 @@ AC_DEFUN([GRC_USRP2],[
dnl firmware uses a subsidiary configure.ac
AC_CONFIG_SUBDIRS([usrp2/firmware])
- dnl Don't do usrp if omnithread or gruel is skipped
+ dnl Don't do usrp if gruel is skipped
GRC_CHECK_DEPENDENCY(usrp2, gruel)
- GRC_CHECK_DEPENDENCY(usrp2, omnithread)
dnl USRP2 host code only works on Linux at the moment
AC_MSG_CHECKING([whether host_os is linux*])
diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
index 428a57992..251f7df10 100755
--- a/config/usrp_libusb.m4
+++ b/config/usrp_libusb.m4
@@ -30,6 +30,7 @@ AC_DEFUN([USRP_LIBUSB], [
libusbok=no
have_libusb1=no
+ LIBUSB_PKG_CONFIG_NAME=''
if test x$1 = xyes; then
PKG_CHECK_MODULES(USB, libusb-1.0, [
libusbok=yes
@@ -37,6 +38,7 @@ AC_DEFUN([USRP_LIBUSB], [
usb_header='libusb-1.0/libusb.h'
usb_lib_func='libusb_bulk_transfer'
usb_lib_name='usb-1.0'
+ LIBUSB_PKG_CONFIG_NAME='libusb-1.0'
])
else
dnl not using libusb1 (for now); see if legacy version is found.
@@ -45,17 +47,24 @@ AC_DEFUN([USRP_LIBUSB], [
dnl user's shell environment
dnl see if the pkgconfig module 'libusb' is available
- PKG_CHECK_MODULES(USB, libusb, [libusbok=yes], [libusbok=no])
+ PKG_CHECK_MODULES(USB, libusb, [
+ libusbok=yes
+ LIBUSB_PKG_CONFIG_NAME='libusb'
+ ], [libusbok=no])
dnl PKG_CHECK_MODULES does not work correctly when embedded
if test $libusbok = no; then
dnl if not, see if the pkgconfig module 'libusb-legacy' is available
- PKG_CHECK_MODULES(USB, [libusb-legacy], [libusbok=yes], [libusbok=no])
+ PKG_CHECK_MODULES(USB, [libusb-legacy], [
+ libusbok=yes
+ LIBUSB_PKG_CONFIG_NAME='libusb-legacy'
+ ], [libusbok=no])
fi
dnl set variables for further testing
usb_header='usb.h'
usb_lib_func='usb_bulk_write'
usb_lib_name='usb'
fi
+ AC_SUBST(LIBUSB_PKG_CONFIG_NAME)
if test x$1 != xyes || test $have_libusb1 = yes; then
dnl Either (1) libusb1 was specified and found; or
dnl (2) libusb1 was not specified. Restart checking.
generated by cgit (git 2.34.1) at 2025-02-23 05:14:59 +0000