[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9324 - in gnuradio/branches/developers/eb/ac-wip: . c
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r9324 - in gnuradio/branches/developers/eb/ac-wip: . config |
|
Date: |
Mon, 18 Aug 2008 22:09:55 -0600 (MDT) |
Author: eb
Date: 2008-08-18 22:09:47 -0600 (Mon, 18 Aug 2008)
New Revision: 9324
Removed:
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_asio.m4
gnuradio/branches/developers/eb/ac-wip/config/gr_boost.m4
Modified:
gnuradio/branches/developers/eb/ac-wip/config/Makefile.am
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_filesystem.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_iostreams.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_program_options.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_regex.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_serialization.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_signals.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_system.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_test_exec_monitor.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_unit_test_framework.m4
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_wserialization.m4
gnuradio/branches/developers/eb/ac-wip/configure.ac
Log:
All boost macros refactored. Ready to merge back to mp-sched
Modified: gnuradio/branches/developers/eb/ac-wip/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/Makefile.am 2008-08-19
03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/Makefile.am 2008-08-19
04:09:47 UTC (rev 9324)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -27,7 +27,6 @@
# List your m4 macros here
m4macros = \
acx_pthread.m4 \
- ax_boost_asio.m4 \
ax_boost_base.m4 \
ax_boost_date_time.m4 \
ax_boost_filesystem.m4 \
@@ -44,7 +43,6 @@
ax_boost_wserialization.m4 \
bnv_have_qt.m4 \
cppunit.m4 \
- gr_boost.m4 \
grc_build.m4 \
grc_gcell.m4 \
grc_gnuradio_core.m4 \
Deleted: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_asio.m4
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -252,11 +252,14 @@
dnl Look in BOOSTLIBDIR for possible candidates
head=$BOOSTLIBDIR/lib[]$1
for f in ${head}*.so* ${head}*.a* ${head}*.dll*; do
- echo 1: $f
+ dnl echo 1: $f
+ case $f in
+ *\**) continue;;
+ esac
f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'`
- echo 2: $f
+ dnl echo 2: $f
f=`echo $f | sed -e 's,\($1.*\)\.so.*$,\1,' -e
's,\($1.*\)\.a.*$,\1,' -e 's,\($1.*\)\.dll.*$,\1,'`
- echo 3: $f
+ dnl echo 3: $f
ax_lib=$f
AC_CHECK_LIB($ax_lib, exit,
@@ -265,7 +268,7 @@
fi
if test "$link_ok" != "yes"; then
- AC_MSG_ERROR([Could not link against lib${unit_name}!])
+ AC_MSG_ERROR([Could not link against lib[$1]!])
fi
AC_LANG_POP([C++])
])
@@ -310,7 +313,7 @@
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- AC_CACHE_CHECK([whether the boost::m4_substr([$1],6) library is
available], [$4],
+ AC_CACHE_CHECK([whether the boost::m4_substr([$1],6) includes are
available], [$4],
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([$2],[$3]),[$4]=yes,[$4]=no)
AC_LANG_POP([C++])
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,7 +1,3 @@
-# ===========================================================================
-# Started with http://autoconf-archive.cryp.to/ax_boost_date_time.html
-# but difference is now huge...
-# ===========================================================================
#
# SYNOPSIS
#
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_filesystem.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_filesystem.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_filesystem.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_filesystem.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for Filesystem library from the Boost C++ libraries. The macro
-# requires a preceding call to AX_BOOST_BASE. Further documentation is
-# available at <http://randspringer.de/boost/index.html>.
+# requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,14 +16,11 @@
#
# HAVE_BOOST_FILESYSTEM
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
# Copyright (c) 2008 Michael Tindal
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -35,78 +28,18 @@
AC_DEFUN([AX_BOOST_FILESYSTEM],
[
- AC_ARG_WITH([boost-filesystem],
- AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
- [use the Filesystem library from boost - it is possible to
specify a certain library for the linker
- e.g. --with-boost-filesystem=boost_filesystem-gcc-mt
]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_filesystem_lib=""
- else
- want_boost="yes"
- ax_boost_user_filesystem_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
+ AC_REQUIRE([AX_BOOST_BASE])
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ dnl depends on boost_system
+ AC_REQUIRE([AX_BOOST_SYSTEM])
+ axbf_LDFLAGS_SAVED=$LDFLAGS
+ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LIB"
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ _AX_BOOST_CHECK([boost_filesystem],
+ address@hidden:@include <boost/filesystem/path.hpp>],
+ [using namespace boost::filesystem;
+ path my_path( "foo/bar/data.txt" );
+ return 0;])
- AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
- ax_cv_boost_filesystem,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/filesystem/path.hpp>]],
- [[using namespace boost::filesystem;
- path my_path( "foo/bar/data.txt" );
- return 0;]]),
- ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_filesystem" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem
library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_filesystem_lib" = "x"; then
- for libextension in `ls
$BOOSTLIBDIR/libboost_filesystem*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e
's;^lib\(boost_filesystem.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"])
- done
- if test "x$link_program_options" != "xyes"; then
- for libextension in `ls
$BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e
's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"])
- done
- fi
- else
- for ax_lib in $ax_boost_user_filesystem_lib
boost_filesystem-$ax_boost_user_filesystem_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"])
- done
-
- fi
- if test "x$link_filesystem" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ LDFLAGS=$axbf_LDFLAGS_SAVED
])
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_iostreams.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_iostreams.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_iostreams.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_iostreams.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for IOStreams library from the Boost C++ libraries. The macro
-# requires a preceding call to AX_BOOST_BASE. Further documentation is
-# available at <http://randspringer.de/boost/index.html>.
+# requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,13 +16,10 @@
#
# HAVE_BOOST_IOSTREAMS
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -34,83 +27,13 @@
AC_DEFUN([AX_BOOST_IOSTREAMS],
[
- AC_ARG_WITH([boost-iostreams],
- AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
- [use the IOStreams library from boost - it is possible to
specify a certain library for the linker
- e.g.
--with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_iostreams_lib=""
- else
- want_boost="yes"
- ax_boost_user_iostreams_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_iostreams],
+ address@hidden:@include
<boost/iostreams/filtering_stream.hpp>
+ @%:@include <boost/range/iterator_range.hpp>],
+ [std::string input = "Hello World!";
+ namespace io = boost::iostreams;
+ io::filtering_istream
in(boost::make_iterator_range(input));
+ return 0;])
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
- ax_cv_boost_iostreams,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/iostreams/filtering_stream.hpp>
- @%:@include
<boost/range/iterator_range.hpp>
- ]],
- [[std::string input = "Hello World!";
- namespace io = boost::iostreams;
- io::filtering_istream
in(boost::make_iterator_range(input));
- return 0;
- ]]),
- ax_cv_boost_iostreams=yes,
ax_cv_boost_iostreams=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_iostreams" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams
library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_iostreams_lib" = "x"; then
- for libextension in `ls
$BOOSTLIBDIR/libboost_iostreams*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e
's;^lib\(boost_iostreams.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_IOSTREAMS_LIB="-l$ax_lib";
AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
- [link_iostreams="no"])
- done
- if test "x$link_iostreams" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e
's;^\(boost_iostreams.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_IOSTREAMS_LIB="-l$ax_lib";
AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
- [link_iostreams="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_iostreams_lib
boost_iostreams-$ax_boost_user_iostreams_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_IOSTREAMS_LIB="-l$ax_lib";
AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
- [link_iostreams="no"])
- done
-
- fi
- if test "x$link_iostreams" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
])
Modified:
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_program_options.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_program_options.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_program_options.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_program_options.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for program options library from the Boost C++ libraries. The macro
-# requires a preceding call to AX_BOOST_BASE. Further documentation is
-# available at <http://randspringer.de/boost/index.html>.
+# requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,13 +16,10 @@
#
# HAVE_BOOST_PROGRAM_OPTIONS
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -34,75 +27,9 @@
AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
[
- AC_ARG_WITH([boost-program-options],
- AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@],
- [use the program options library from boost - it is
possible to specify a certain library for the linker
- e.g.
--with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_program_options_lib=""
- else
- want_boost="yes"
- ax_boost_user_program_options_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- export want_boost
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
- AC_CACHE_CHECK([whether the Boost::Program_Options library is
available],
- ax_cv_boost_program_options,
- [AC_LANG_PUSH(C++)
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
- ]],
-
[[boost::program_options::options_description generic("Generic options");
- return 0;]]),
- ax_cv_boost_program_options=yes,
ax_cv_boost_program_options=no)
- AC_LANG_POP([C++])
- ])
- if test "$ax_cv_boost_program_options" = yes; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the
Boost::PROGRAM_OPTIONS library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_program_options_lib" = "x"; then
- for libextension in `ls
$BOOSTLIBDIR/libboost_program_options*.{so,a}* 2>/dev/null | sed 's,.*/,,' |
sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;' -e
's;^lib\(boost_program_options.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib";
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
- [link_program_options="no"])
- done
- if test "x$link_program_options" != "xyes"; then
- for libextension in `ls
$BOOSTLIBDIR/boost_program_options*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed
-e 's;^\(boost_program_options.*\)\.dll.*$;\1;' -e
's;^\(boost_program_options.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib";
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
- [link_program_options="no"])
- done
- fi
- else
- for ax_lib in $ax_boost_user_program_options_lib
boost_program_options-$ax_boost_user_program_options_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib";
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
- [link_program_options="no"])
- done
- fi
- if test "x$link_program_options" != "xyes"; then
- AC_MSG_ERROR([Could not link against [$ax_lib] !])
- fi
- AC_LANG_POP([C++])
- fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_program_options],
+ address@hidden:@include <boost/program_options.hpp>],
+ [boost::program_options::options_description
generic("Generic options");
+ return 0;])
])
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_regex.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_regex.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_regex.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_regex.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for Regex library from the Boost C++ libraries. The macro requires
-# a preceding call to AX_BOOST_BASE. Further documentation is available at
-# <http://randspringer.de/boost/index.html>.
+# a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,14 +16,11 @@
#
# HAVE_BOOST_REGEX
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
# Copyright (c) 2008 Michael Tindal
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -35,77 +28,8 @@
AC_DEFUN([AX_BOOST_REGEX],
[
- AC_ARG_WITH([boost-regex],
- AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
- [use the Regex library from boost - it is possible to
specify a certain library for the linker
- e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_regex_lib=""
- else
- want_boost="yes"
- ax_boost_user_regex_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::Regex library is available,
- ax_cv_boost_regex,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/regex.hpp>
- ]],
- [[boost::regex r(); return 0;]]),
- ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_regex" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is
available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_regex_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e
's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib";
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
- [link_regex="no"])
- done
- if test "x$link_regex" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e
's;^\(boost_regex.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib";
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
- [link_regex="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_regex_lib
boost_regex-$ax_boost_user_regex_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_REGEX_LIB="-l$ax_lib";
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
- [link_regex="no"])
- done
- fi
- if test "x$link_regex" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_regex],
+ address@hidden:@include <boost/regex.hpp>],
+ [boost::regex r(); return 0;])
])
Modified:
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_serialization.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_serialization.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_serialization.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_serialization.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for Serialization library from the Boost C++ libraries. The macro
-# requires a preceding call to AX_BOOST_BASE. Further documentation is
-# available at <http://randspringer.de/boost/index.html>.
+# requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,13 +16,10 @@
#
# HAVE_BOOST_SERIALIZATION
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -34,84 +27,12 @@
AC_DEFUN([AX_BOOST_SERIALIZATION],
[
- AC_ARG_WITH([boost-serialization],
- AS_HELP_STRING([--with-boost-serialization@<:@=special-lib@:>@],
- [use the Serialization library from boost - it is possible
to specify a certain library for the linker
- e.g.
--with-boost-serialization=boost_serialization-gcc-mt-d-1_33_1 ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_serialization_lib=""
- else
- want_boost="yes"
- ax_boost_user_serialization_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- AC_MSG_WARN(BOOST_CPPFLAGS $BOOST_CPPFLAGS)
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::Serialization library is available,
- ax_cv_boost_serialization,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<fstream>
- @%:@include
<boost/archive/text_oarchive.hpp>
- @%:@include
<boost/archive/text_iarchive.hpp>
- ]],
- [[std::ofstream ofs("filename");
- boost::archive::text_oarchive oa(ofs);
- return 0;
- ]]),
- ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_serialization" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the
Boost::Serialization library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_serialization_lib" = "x"; then
- for libextension in `ls
$BOOSTLIBDIR/libboost_serialization*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed
-e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e
's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
- [link_serialization="no"])
- done
- if test "x$link_serialization" != "xyes"; then
- for libextension in `ls
$BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_serialization.*\)\.dll.*$;\1;' -e
's;^\(boost_serialization.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
- [link_serialization="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_serialization_lib
boost_serialization-$ax_boost_user_serialization_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_SERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
- [link_serialization="no"])
- done
-
- fi
- if test "x$link_serialization" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_serialization],
+ address@hidden:@include <fstream>
+ @%:@include <boost/archive/text_oarchive.hpp>
+ @%:@include <boost/archive/text_iarchive.hpp>],
+ [std::ofstream ofs("filename");
+ boost::archive::text_oarchive oa(ofs);
+ return 0;])
])
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_signals.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_signals.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_signals.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_signals.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for Signals library from the Boost C++ libraries. The macro
-# requires a preceding call to AX_BOOST_BASE. Further documentation is
-# available at <http://randspringer.de/boost/index.html>.
+# requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,14 +16,11 @@
#
# HAVE_BOOST_SIGNALS
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
# Copyright (c) 2008 Michael Tindal
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -35,80 +28,8 @@
AC_DEFUN([AX_BOOST_SIGNALS],
[
- AC_ARG_WITH([boost-signals],
- AS_HELP_STRING([--with-boost-signals@<:@=special-lib@:>@],
- [use the Signals library from boost - it is possible to
specify a certain library for the linker
- e.g. --with-boost-signals=boost_signals-gcc-mt-d ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_signals_lib=""
- else
- want_boost="yes"
- ax_boost_user_signals_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::Signals library is available,
- ax_cv_boost_signals,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/signal.hpp>
- ]],
- [[boost::signal<void ()> sig;
- return 0;
- ]]),
- ax_cv_boost_signals=yes, ax_cv_boost_signals=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_signals" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals
library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_signals_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_signals*.{so,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_signals.*\)\.so.*$;\1;' -e
's;^lib\(boost_signals.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SIGNALS_LIB="-l$ax_lib";
AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
- [link_signals="no"])
- done
- if test "x$link_signals" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_signals*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e
's;^\(boost_signals.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SIGNALS_LIB="-l$ax_lib";
AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
- [link_signals="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_signals_lib
boost_signals-$ax_boost_user_signals_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_SIGNALS_LIB="-l$ax_lib";
AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
- [link_signals="no"])
- done
-
- fi
- if test "x$link_signals" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_signals],
+ address@hidden:@include <boost/signal.hpp>],
+ [boost::signal<void ()> sig; return 0;])
])
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_system.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_system.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_system.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,5 +1,6 @@
# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_system.html
+# started with this: http://autoconf-archive.cryp.to/ax_boost_system.html,
+# virtually nothing left
# ===========================================================================
#
# SYNOPSIS
@@ -9,8 +10,7 @@
# DESCRIPTION
#
# Test for System library from the Boost C++ libraries. The macro requires
-# a preceding call to AX_BOOST_BASE. Further documentation is available at
-# <http://randspringer.de/boost/index.html>.
+# a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,15 +20,12 @@
#
# HAVE_BOOST_SYSTEM
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
# Copyright (c) 2008 Michael Tindal
# Copyright (c) 2008 Daniel Casimiro <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -36,85 +33,8 @@
AC_DEFUN([AX_BOOST_SYSTEM],
[
- AC_ARG_WITH([boost-system],
- AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
- [use the System library from boost - it is possible to
specify a certain library for the linker
- e.g. --with-boost-system=boost_system-gcc-mt ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_system_lib=""
- else
- want_boost="yes"
- ax_boost_user_system_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_BUILD])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::System library is available,
- ax_cv_boost_system,
- [AC_LANG_PUSH([C++])
- CXXFLAGS_SAVE=$CXXFLAGS
-
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/system/error_code.hpp>]],
- [[boost::system::system_category]]),
- ax_cv_boost_system=yes, ax_cv_boost_system=no)
- CXXFLAGS=$CXXFLAGS_SAVE
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_system" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_SUBST(BOOST_CPPFLAGS)
-
- AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library
is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
- LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e
's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- if test "x$link_system" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e
's;^\(boost_system.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_system_lib
boost_system-$ax_boost_user_system_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
-
- fi
- if test "x$link_system" = "xno"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_system],
+ address@hidden:@include <boost/system/error_code.hpp>],
+ [boost::system::system_category])
])
Modified:
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_test_exec_monitor.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_test_exec_monitor.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_test_exec_monitor.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_test_exec_monitor.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for Test_Exec_Monitor library from the Boost C++ libraries. The
-# macro requires a preceding call to AX_BOOST_BASE. Further documentation
-# is available at <http://randspringer.de/boost/index.html>.
+# macro requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,14 +16,11 @@
#
# HAVE_BOOST_TEST_EXEC_MONITOR
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Dodji Seketeli <address@hidden>
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -35,105 +28,8 @@
AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
[
- AC_ARG_WITH([boost-test-exec-monitor],
- AS_HELP_STRING([--with-boost-test-exec-monitor@<:@=special-lib@:>@],
- [use the Test_Exec_Monitor library from boost - it is
possible to specify a certain library for the linker
- e.g.
--with-boost-test-exec-monitor=boost_test_exec_monitor-gcc ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_test_exec_monitor_lib=""
- else
- want_boost="yes"
- ax_boost_user_test_exec_monitor_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::Test_Exec_Monitor library is
available,
- ax_cv_boost_test_exec_monitor,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/test_tools.hpp>]],
- [[int i=1 ; BOOST_REQUIRE(i==1); ; return
0;]]),
- ax_cv_boost_test_exec_monitor=yes,
ax_cv_boost_test_exec_monitor=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_test_exec_monitor" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_TEST_EXEC_MONITOR,,[define if the
Boost::Test_Exec_Monitor library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
- if test "x$ax_boost_user_test_exec_monitor_lib" = "x"; then
- saved_ldflags="${LDFLAGS}"
-
- for monitor_library in `ls
$BOOSTLIBDIR/libboost_test_exec_monitor*.{so,a}* 2>/dev/null` ; do
- if test -r $monitor_library ; then
- libextension=`echo $monitor_library | sed 's,.*/,,' |
sed -e 's;^lib\(boost_test_exec_monitor.*\)\.so.*$;\1;' -e
's;^lib\(boost_test_exec_monitor.*\)\.a*$;\1;'`
- ax_lib=${libextension}
- link_test_exec_monitor="yes"
- else
- link_test_exec_monitor="no"
- fi
-
- if test "x$link_test_exec_monitor" = "xyes"; then
- BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib"
- AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB)
- break
- fi
- done
- if test "x$link_test_exec_monitor" != "xyes"; then
- for libextension in `ls
$BOOSTLIBDIR/boost_test_exec_monitor*.{dll,a}* 2>/dev/null | sed 's,.*/,,' |
sed -e 's;^\(boost_test_exec_monitor.*\)\.dll.*$;\1;' -e
's;^\(boost_test_exec_monitor.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib";
AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB) link_test_exec_monitor="yes"; break],
- [link_test_exec_monitor="no"])
- done
- fi
-
- else
- link_test_exec_monitor="no"
- saved_ldflags="${LDFLAGS}"
- for ax_lib in
boost_test_exec_monitor-$ax_boost_user_test_exec_monitor_lib
$ax_boost_user_test_exec_monitor_lib ; do
- if test "x$link_test_exec_monitor" = "xyes"; then
- break;
- fi
- for monitor_library in `ls
$BOOSTLIBDIR/lib${ax_lib}.{so,a}* 2>/dev/null` ; do
- if test -r $monitor_library ; then
- libextension=`echo $monitor_library | sed 's,.*/,,' |
sed -e 's;^lib\(boost_test_exec_monitor.*\)\.so.*$;\1;' -e
's;^lib\(boost_test_exec_monitor.*\)\.a*$;\1;'`
- ax_lib=${libextension}
- link_test_exec_monitor="yes"
- else
- link_test_exec_monitor="no"
- fi
-
- if test "x$link_test_exec_monitor" = "xyes"; then
- BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib"
- AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB)
- break
- fi
- done
- done
- fi
- if test "x$link_test_exec_monitor" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_test_exec_monitor],
+ address@hidden:@include <boost/test/test_tools.hpp>],
+ [int i=1 ; BOOST_REQUIRE(i==1); ; return 0;])
])
Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,7 +1,3 @@
-# ===========================================================================
-# Started with http://autoconf-archive.cryp.to/ax_boost_thread.html,
-# but difference is now huge...
-# ===========================================================================
#
# SYNOPSIS
#
@@ -50,7 +46,7 @@
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
- AC_CACHE_CHECK(whether the boost::thread library is available,
+ AC_CACHE_CHECK(whether the boost::thread includes are available,
ax_cv_boost_thread,
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/thread/thread.hpp>]],
Modified:
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_unit_test_framework.m4
===================================================================
---
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_unit_test_framework.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_unit_test_framework.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_unit_test_framework.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -9,8 +6,7 @@
# DESCRIPTION
#
# Test for Unit_Test_Framework library from the Boost C++ libraries. The
-# macro requires a preceding call to AX_BOOST_BASE. Further documentation
-# is available at <http://randspringer.de/boost/index.html>.
+# macro requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,13 +16,10 @@
#
# HAVE_BOOST_UNIT_TEST_FRAMEWORK
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -34,104 +27,10 @@
AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
[
- AC_ARG_WITH([boost-unit-test-framework],
- AS_HELP_STRING([--with-boost-unit-test-framework@<:@=special-lib@:>@],
- [use the Unit_Test_Framework library from boost - it is
possible to specify a certain library for the linker
- e.g.
--with-boost-unit-test-framework=boost_unit_test_framework-gcc ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_unit_test_framework_lib=""
- else
- want_boost="yes"
- ax_boost_user_unit_test_framework_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is
available,
- ax_cv_boost_unit_test_framework,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/unit_test.hpp>]],
- [[using boost::unit_test::test_suite;
- test_suite* test= BOOST_TEST_SUITE( "Unit
test example 1" ); return 0;]]),
- ax_cv_boost_unit_test_framework=yes,
ax_cv_boost_unit_test_framework=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the
Boost::Unit_Test_Framework library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
- if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
- saved_ldflags="${LDFLAGS}"
- for monitor_library in `ls
$BOOSTLIBDIR/libboost_unit_test_framework*.{so,a}* 2>/dev/null` ; do
- if test -r $monitor_library ; then
- libextension=`echo $monitor_library | sed 's,.*/,,' |
sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e
's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
- ax_lib=${libextension}
- link_unit_test_framework="yes"
- else
- link_unit_test_framework="no"
- fi
-
- if test "x$link_unit_test_framework" = "xyes"; then
- BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
- AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
- break
- fi
- done
- if test "x$link_unit_test_framework" != "xyes"; then
- for libextension in `ls
$BOOSTLIBDIR/boost_unit_test_framework*.{dll,a}* 2>/dev/null | sed 's,.*/,,' |
sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e
's;^\(boost_unit_test_framework.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib";
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) link_unit_test_framework="yes"; break],
- [link_unit_test_framework="no"])
- done
- fi
- else
- link_unit_test_framework="no"
- saved_ldflags="${LDFLAGS}"
- for ax_lib in
boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib
$ax_boost_user_unit_test_framework_lib ; do
- if test "x$link_unit_test_framework" = "xyes"; then
- break;
- fi
- for unittest_library in `ls
$BOOSTLIBDIR/lib${ax_lib}.{so,a}* 2>/dev/null` ; do
- if test -r $unittest_library ; then
- libextension=`echo $unittest_library | sed 's,.*/,,' |
sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e
's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
- ax_lib=${libextension}
- link_unit_test_framework="yes"
- else
- link_unit_test_framework="no"
- fi
-
- if test "x$link_unit_test_framework" = "xyes"; then
- BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
- AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
- break
- fi
- done
- done
- fi
- if test "x$link_unit_test_framework" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ AC_REQUIRE([AX_BOOST_BASE])
+ _AX_BOOST_CHECK([boost_unit_test_framework],
+ address@hidden:@include <boost/test/unit_test.hpp>],
+ [using boost::unit_test::test_suite;
+ test_suite* test= BOOST_TEST_SUITE( "Unit test example 1"
);
+ return 0;])
])
Modified:
gnuradio/branches/developers/eb/ac-wip/config/ax_boost_wserialization.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_wserialization.m4
2008-08-19 03:32:40 UTC (rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_wserialization.m4
2008-08-19 04:09:47 UTC (rev 9324)
@@ -1,6 +1,3 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_boost_wserialization.html
-# ===========================================================================
#
# SYNOPSIS
#
@@ -8,9 +5,8 @@
#
# DESCRIPTION
#
-# Test for Serialization library from the Boost C++ libraries. The macro
-# requires a preceding call to AX_BOOST_BASE. Further documentation is
-# available at <http://randspringer.de/boost/index.html>.
+# Test for WSerialization library from the Boost C++ libraries. The macro
+# requires a preceding call to AX_BOOST_BASE.
#
# This macro calls:
#
@@ -20,13 +16,10 @@
#
# HAVE_BOOST_WSERIALIZATION
#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -34,83 +27,20 @@
AC_DEFUN([AX_BOOST_WSERIALIZATION],
[
- AC_ARG_WITH([boost-wserialization],
- AS_HELP_STRING([--with-boost-wserialization@<:@=special-lib@:>@],
- [use the WSerialization library from boost - it is
possible to specify a certain library for the linker
- e.g.
--with-boost-wserialization=boost_wserialization-gcc-mt-d-1_33_1 ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_wserialization_lib=""
- else
- want_boost="yes"
- ax_boost_user_wserialization_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
+ AC_REQUIRE([AX_BOOST_BASE])
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ dnl depends on BOOST_SERIALIZATION
+ AC_REQUIRE([AX_BOOST_SERIALIZATION])
+ axbws_LDFLAGS_SAVED=$LDFLAGS
+ LDFLAGS="$LDFLAGS $BOOST_SERIALIZATION_LIB"
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ _AX_BOOST_CHECK([boost_wserialization],
+ address@hidden:@include <fstream>
+ @%:@include <boost/archive/text_oarchive.hpp>
+ @%:@include <boost/archive/text_iarchive.hpp>],
+ [std::ofstream ofs("filename");
+ boost::archive::text_oarchive oa(ofs);
+ return 0;])
- AC_CACHE_CHECK(whether the Boost::WSerialization library is available,
- ax_cv_boost_wserialization,
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<fstream>
- @%:@include
<boost/archive/text_oarchive.hpp>
- @%:@include
<boost/archive/text_iarchive.hpp>
- ]],
- [[std::ofstream ofs("filename");
- boost::archive::text_oarchive oa(ofs);
- return 0;
- ]]),
- ax_cv_boost_wserialization=yes,
ax_cv_boost_wserialization=no)
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_wserialization" = "xyes"; then
- AC_LANG_PUSH([C++])
- AC_DEFINE(HAVE_BOOST_WSERIALIZATION,,[define if the
Boost::WSerialization library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_wserialization_lib" = "x"; then
- for libextension in `ls
$BOOSTLIBDIR/libboost_wserialization*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed
-e 's;^lib\(boost_wserialization.*\)\.so.*$;\1;' -e
's;^lib\(boost_wserialization.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_WSERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break],
- [link_wserialization="no"])
- done
- if test "x$link_wserialization" != "xyes"; then
- for libextension in `ls
$BOOSTLIBDIR/boost_wserialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed
-e 's;^\(boost_wserialization.*\)\.dll.*$;\1;' -e
's;^\(boost_wserialization.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_WSERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break],
- [link_wserialization="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_wserialization_lib
boost_wserialization-$ax_boost_user_wserialization_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_WSERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break],
- [link_wserialization="no"])
- done
-
- fi
- if test "x$link_wserialization" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- AC_LANG_POP([C++])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ LDFLAGS=$axbf_LDFLAGS_SAVED
])
Deleted: gnuradio/branches/developers/eb/ac-wip/config/gr_boost.m4
Modified: gnuradio/branches/developers/eb/ac-wip/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/configure.ac 2008-08-19 03:32:40 UTC
(rev 9323)
+++ gnuradio/branches/developers/eb/ac-wip/configure.ac 2008-08-19 04:09:47 UTC
(rev 9324)
@@ -100,10 +100,10 @@
dnl Checks for libraries.
AC_CHECK_LIB(socket,socket)
-dnl check for threads (mandatory)
+dnl check for omnithreads (will soon be removed)
GR_OMNITHREAD
-CFLAGS="${CFLAGS} $PTHREAD_CFLAGS"
-CXXFLAGS="${CXXFLAGS} $PTHREAD_CFLAGS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
if test x$CXX_FOR_BUILD = x
then
@@ -212,28 +212,38 @@
[AM_PATH_CPPUNIT([1.9.14],[],
[AC_MSG_ERROR([GNU Radio requires cppunit. Stop])])])
+CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS
+AC_SUBST(CPPUNIT_INCLUDES)
+
dnl see if GUILE is installed
AC_PATH_PROG(GUILE,guile)
-CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS
-AC_SUBST(CPPUNIT_INCLUDES)
-
dnl
-dnl Move to config subdir when sorted out
+dnl We require the boost headers, thread lib and date_time lib.
+dnl AX_BOOST_BASE finds the headers and the lib dir (-L<foo>)
dnl
-dnl calls AC_SUBST(BOOST_CPPFLAGS) and AC_SUBST(BOOST_LDFLAGS)
-dnl and sets HAVE_BOOST
+dnl calls AC_SUBST(BOOST_CPPFLAGS), AC_SUBST(BOOST_LDFLAGS) and defines
HAVE_BOOST
AX_BOOST_BASE([1.35])
-
-dnl calls AC_SUBST(BOOST_THREAD_LIB)
-dnl and sets HAVE_BOOST_THREAD
+dnl calls AC_SUBST(BOOST_THREAD_LIB), AC_SUBST(BOOST_CXXFLAGS) and defines
HAVE_BOOST_THREAD
AX_BOOST_THREAD
-CXXFLAGS="${CXXFLAGS} $BOOST_CXXFLAGS"
+CXXFLAGS="$CXXFLAGS $BOOST_CXXFLAGS" dnl often picks up a -pthread or
something similar
+CFLAGS="$CFLAGS $BOOST_CXXFLAGS" dnl often picks up a -pthread or
something similar
-dnl calls AC_SUBST(BOOST_DATE_TIME_LIB)
-dnl and sets HAVE_BOOST_DATE_TIME
+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
+dnl AX_BOOST_IOSTREAMS
+dnl AX_BOOST_PROGRAM_OPTIONS
+dnl AX_BOOST_REGEX
+dnl AX_BOOST_SERIALIZATION
+dnl AX_BOOST_SIGNALS
+dnl AX_BOOST_SYSTEM
+dnl AX_BOOST_TEST_EXEC_MONITOR
+dnl AX_BOOST_UNIT_TEST_FRAMEWORK
+dnl AX_BOOST_WSERIALIZATION
dnl If this is being done from a subversion tree, create variables
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9324 - in gnuradio/branches/developers/eb/ac-wip: . config,
eb <=