[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8888 - gnuradio/branches/developers/eb/sched-wip/conf
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r8888 - gnuradio/branches/developers/eb/sched-wip/config |
|
Date: |
Mon, 14 Jul 2008 20:47:17 -0600 (MDT) |
Author: eb
Date: 2008-07-14 20:47:17 -0600 (Mon, 14 Jul 2008)
New Revision: 8888
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4
Log:
In ax_boost_*.m4, expanded tabs to spaces assuming tabwidth was 4.
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -35,39 +35,39 @@
AC_DEFUN([AX_BOOST_ASIO],
[
- AC_ARG_WITH([boost-asio],
- AS_HELP_STRING([--with-boost-asio@<:@=special-lib@:>@],
+ AC_ARG_WITH([boost-asio],
+ AS_HELP_STRING([--with-boost-asio@<:@=special-lib@:>@],
[use the ASIO library from boost - it is possible to
specify a certain library for the linker
e.g. --with-boost-asio=boost_system-gcc41-mt-1_34 ]),
[
if test "$withval" = "no"; then
- want_boost="no"
+ want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_asio_lib=""
else
- want_boost="yes"
- ax_boost_user_asio_lib="$withval"
- fi
+ want_boost="yes"
+ ax_boost_user_asio_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::ASIO library is available,
- ax_cv_boost_asio,
+ ax_cv_boost_asio,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ @%:@include
<boost/asio.hpp>
-
]],
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ @%:@include <boost/asio.hpp>
+ ]],
[[
boost::asio::io_service io;
@@ -75,35 +75,35 @@
boost::asio::deadline_timer t(io);
t.cancel();
io.run_one();
- return
0;
+ return 0;
]]),
ax_cv_boost_asio=yes, ax_cv_boost_asio=no)
AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_asio" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO
library is available])
- BN=boost_system
+ ])
+ if test "x$ax_cv_boost_asio" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO library is
available])
+ BN=boost_system
if test "x$ax_boost_user_asio_lib" = "x"; then
- for ax_lib in $BN $BN-$CC $BN-$CC-mt
$BN-$CC-mt-s $BN-$CC-s \
+ for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s
lib$BN-$CC-s \
$BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s
$BN-mgw-s ; do
- AC_CHECK_LIB($ax_lib, main,
[BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break],
+ AC_CHECK_LIB($ax_lib, main, [BOOST_ASIO_LIB="-l$ax_lib"
AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break],
[link_thread="no"])
- done
+ done
else
for ax_lib in $ax_boost_user_asio_lib
$BN-$ax_boost_user_asio_lib; do
- AC_CHECK_LIB($ax_lib, main,
+ AC_CHECK_LIB($ax_lib, main,
[BOOST_ASIO_LIB="-l$ax_lib"
AC_SUBST(BOOST_ASIO_LIB) link_asio="yes" break],
[link_asio="no"])
done
fi
- if test "x$link_asio" = "xno"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- fi
+ if test "x$link_asio" = "xno"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -38,17 +38,17 @@
AC_DEFUN([AX_BOOST_BASE],
[
AC_ARG_WITH([boost],
- AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes)
- it is possible to specify the root directory for boost (optional)]),
- [
+ AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) -
it is possible to specify the root directory for boost (optional)]),
+ [
if test "$withval" = "no"; then
- want_boost="no"
+ want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ac_boost_path=""
else
- want_boost="yes"
+ want_boost="yes"
ac_boost_path="$withval"
- fi
+ fi
],
[want_boost="yes"])
@@ -68,33 +68,33 @@
)
if test "x$want_boost" = "xyes"; then
- boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
- boost_lib_version_req_shorten=`expr $boost_lib_version_req :
'\([[0-9]]*\.[[0-9]]*\)'`
- boost_lib_version_req_major=`expr $boost_lib_version_req :
'\([[0-9]]*\)'`
- boost_lib_version_req_minor=`expr $boost_lib_version_req :
'[[0-9]]*\.\([[0-9]]*\)'`
- boost_lib_version_req_sub_minor=`expr $boost_lib_version_req :
'[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
- if test "x$boost_lib_version_req_sub_minor" = "x" ; then
- boost_lib_version_req_sub_minor="0"
- fi
- WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+
$boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
- AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
- succeeded=no
+ boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+ boost_lib_version_req_shorten=`expr $boost_lib_version_req :
'\([[0-9]]*\.[[0-9]]*\)'`
+ boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+ boost_lib_version_req_minor=`expr $boost_lib_version_req :
'[[0-9]]*\.\([[0-9]]*\)'`
+ boost_lib_version_req_sub_minor=`expr $boost_lib_version_req :
'[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+ if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+ boost_lib_version_req_sub_minor="0"
+ fi
+ WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+
$boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+ AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+ succeeded=no
- dnl first we check the system location for boost libraries
- dnl this location ist chosen if boost libraries are installed with the
--layout=system option
- dnl or if you install boost with RPM
- if test "$ac_boost_path" != ""; then
- BOOST_LDFLAGS="-L$ac_boost_path/lib"
- BOOST_CPPFLAGS="-I$ac_boost_path/include"
- else
- for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path_tmp/include/boost" && test
-r "$ac_boost_path_tmp/include/boost"; then
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
- BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
- break;
- fi
- done
- fi
+ dnl first we check the system location for boost libraries
+ dnl this location ist chosen if boost libraries are installed with the
--layout=system option
+ dnl or if you install boost with RPM
+ if test "$ac_boost_path" != ""; then
+ BOOST_LDFLAGS="-L$ac_boost_path/lib"
+ BOOST_CPPFLAGS="-I$ac_boost_path/include"
+ else
+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path_tmp/include/boost" && test -r
"$ac_boost_path_tmp/include/boost"; then
+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+ BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+ break;
+ fi
+ done
+ fi
dnl overwrite ld flags if we have required special directory with
dnl --with-boost-libdir parameter
@@ -102,122 +102,122 @@
BOOST_LDFLAGS="-L$ac_boost_lib_path"
fi
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- @%:@include <boost/version.hpp>
- ]], [[
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
- ]])],[
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ @%:@include <boost/version.hpp>
+ ]], [[
+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
+ // Everything is okay
+ #else
+ # error Boost version is too old
+ #endif
+ ]])],[
AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ],[
- ])
- AC_LANG_POP([C++])
+ succeeded=yes
+ found_system=yes
+ ],[
+ ])
+ AC_LANG_POP([C++])
- dnl if we found no boost with system layout we search for boost
libraries
- dnl built and installed without the --layout=system option or for a
staged(not installed) version
- if test "x$succeeded" != "xyes"; then
- _version=0
- if test "$ac_boost_path" != ""; then
- if test -d "$ac_boost_path" && test -r
"$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-*
2>/dev/null`; do
- _version_tmp=`echo $i | sed
"s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \>
$_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- fi
- VERSION_UNDERSCORE=`echo $_version |
sed 's/\./_/'`
-
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
- done
- fi
- else
- for ac_boost_path in /usr /usr/local /opt /opt/local ;
do
- if test -d "$ac_boost_path" && test -r
"$ac_boost_path"; then
- for i in `ls -d
$ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed
"s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \>
$_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- best_path=$ac_boost_path
- fi
- done
- fi
- done
+ dnl if we found no boost with system layout we search for boost libraries
+ dnl built and installed without the --layout=system option or for a
staged(not installed) version
+ if test "x$succeeded" != "xyes"; then
+ _version=0
+ if test "$ac_boost_path" != ""; then
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed
's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ fi
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+ done
+ fi
+ else
+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-*
2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed
's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ best_path=$ac_boost_path
+ fi
+ done
+ fi
+ done
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
if test "$ac_boost_lib_path" = ""
then
BOOST_LDFLAGS="-L$best_path/lib"
fi
- if test "x$BOOST_ROOT" != "x"; then
- if test -d "$BOOST_ROOT" && test -r
"$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r
"$BOOST_ROOT/stage/lib"; then
- version_dir=`expr //$BOOST_ROOT :
'.*/\(.*\)'`
- stage_version=`echo $version_dir | sed
's/boost_//' | sed 's/_/./g'`
- stage_version_shorten=`expr
$stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
- V_CHECK=`expr $stage_version_shorten
\>\= $_version`
+ if test "x$BOOST_ROOT" != "x"; then
+ if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d
"$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
+ version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+ stage_version=`echo $version_dir | sed 's/boost_//' | sed
's/_/./g'`
+ stage_version_shorten=`expr $stage_version :
'\([[0-9]]*\.[[0-9]]*\)'`
+ V_CHECK=`expr $stage_version_shorten \>\= $_version`
if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ;
then
- AC_MSG_NOTICE(We will use a
staged boost library from $BOOST_ROOT)
- BOOST_CPPFLAGS="-I$BOOST_ROOT"
-
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
- fi
- fi
- fi
- fi
+ AC_MSG_NOTICE(We will use a staged boost library from
$BOOST_ROOT)
+ BOOST_CPPFLAGS="-I$BOOST_ROOT"
+ BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
+ fi
+ fi
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- @%:@include <boost/version.hpp>
- ]], [[
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
- ]])],[
- AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ],[
- ])
- AC_LANG_POP([C++])
- fi
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ @%:@include <boost/version.hpp>
+ ]], [[
+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
+ // Everything is okay
+ #else
+ # error Boost version is too old
+ #endif
+ ]])],[
+ AC_MSG_RESULT(yes)
+ succeeded=yes
+ found_system=yes
+ ],[
+ ])
+ AC_LANG_POP([C++])
+ fi
- if test "$succeeded" != "yes" ; then
- if test "$_version" = "0" ; then
- AC_MSG_ERROR([[We could not detect the boost libraries
(version $boost_lib_version_req_shorten or higher). If you have a staged boost
library (still not installed) please specify \$BOOST_ROOT in your environment
and do not give a PATH to --with-boost option. If you are sure you have boost
installed, then check your version number looking in <boost/version.hpp>. See
http://randspringer.de/boost for more documentation.]])
- else
- AC_MSG_NOTICE([Your boost libraries seems to old
(version $_version).])
- fi
- else
- AC_SUBST(BOOST_CPPFLAGS)
- AC_SUBST(BOOST_LDFLAGS)
- AC_DEFINE(HAVE_BOOST,,[define if the Boost library is
available])
- fi
+ if test "$succeeded" != "yes" ; then
+ if test "$_version" = "0" ; then
+ AC_MSG_ERROR([[We could not detect the boost libraries (version
$boost_lib_version_req_shorten or higher). If you have a staged boost library
(still not installed) please specify \$BOOST_ROOT in your environment and do
not give a PATH to --with-boost option. If you are sure you have boost
installed, then check your version number looking in <boost/version.hpp>. See
http://randspringer.de/boost for more documentation.]])
+ else
+ AC_MSG_NOTICE([Your boost libraries seems to old (version
$_version).])
+ fi
+ else
+ AC_SUBST(BOOST_CPPFLAGS)
+ AC_SUBST(BOOST_LDFLAGS)
+ AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+ fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -35,77 +35,77 @@
AC_DEFUN([AX_BOOST_DATE_TIME],
[
- AC_ARG_WITH([boost-date-time],
- AS_HELP_STRING([--with-boost-date-time@<:@=special-lib@:>@],
+ AC_ARG_WITH([boost-date-time],
+ AS_HELP_STRING([--with-boost-date-time@<:@=special-lib@:>@],
[use the Date_Time library from boost - it is possible to
specify a certain library for the linker
e.g.
--with-boost-date-time=boost_date_time-gcc-mt-d-1_33_1 ]),
[
if test "$withval" = "no"; then
- want_boost="no"
+ want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_date_time_lib=""
else
- want_boost="yes"
- ax_boost_user_date_time_lib="$withval"
- fi
+ want_boost="yes"
+ ax_boost_user_date_time_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
- ax_cv_boost_date_time,
+ ax_cv_boost_date_time,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/date_time/gregorian/gregorian_types.hpp>]],
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/date_time/gregorian/gregorian_types.hpp>]],
[[using namespace boost::gregorian; date
d(2002,Jan,10);
return 0;
]]),
ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_date_time" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the
Boost::Date_Time library is available])
+ ])
+ if test "x$ax_cv_boost_date_time" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time
library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_date_time_lib" = "x"; then
for libextension in `ls
$BOOSTLIBDIR/libboost_date_time*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e
's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
+ AC_CHECK_LIB($ax_lib, exit,
[BOOST_DATE_TIME_LIB="-l$ax_lib";
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
[link_date_time="no"])
- done
+ done
if test "x$link_date_time" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_date_time*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e
's;^\(boost_date_time.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
+ AC_CHECK_LIB($ax_lib, exit,
[BOOST_DATE_TIME_LIB="-l$ax_lib";
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
[link_date_time="no"])
- done
+ done
fi
else
for ax_lib in $ax_boost_user_date_time_lib
boost_date_time-$ax_boost_user_date_time_lib; do
- AC_CHECK_LIB($ax_lib, main,
+ AC_CHECK_LIB($ax_lib, main,
[BOOST_DATE_TIME_LIB="-l$ax_lib";
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
[link_date_time="no"])
done
fi
- if test "x$link_date_time" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- fi
+ if test "x$link_date_time" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -35,76 +35,76 @@
AC_DEFUN([AX_BOOST_FILESYSTEM],
[
- AC_ARG_WITH([boost-filesystem],
- AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_filesystem_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
- ax_cv_boost_filesystem,
+ 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)
+ ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_filesystem" = "xyes"; then
- AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the
Boost::Filesystem library is available])
+ ])
+ if test "x$ax_cv_boost_filesystem" = "xyes"; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_filesystem" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -34,81 +34,81 @@
AC_DEFUN([AX_BOOST_IOSTREAMS],
[
- AC_ARG_WITH([boost-iostreams],
- AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_iostreams_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
- ax_cv_boost_iostreams,
+ 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>
-
]],
+ 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;
+ 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_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the
Boost::IOStreams library is available])
+ ])
+ if test "x$ax_cv_boost_iostreams" = "xyes"; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_iostreams" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4
===================================================================
---
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -34,73 +34,73 @@
AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
[
- AC_ARG_WITH([boost-program-options],
-
AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_program_options_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ 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>
+ 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_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define
if the Boost::PROGRAM_OPTIONS library is available])
+ AC_LANG_POP([C++])
+ ])
+ if test "$ax_cv_boost_program_options" = yes; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ if test "x$link_program_options" != "xyes"; then
+ AC_MSG_ERROR([Could not link against [$ax_lib] !])
+ fi
+ fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -69,8 +69,8 @@
#include <boost/python/module.hpp>
using namespace boost::python;
BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
- [[return 0;]]),
- ac_cv_boost_python=yes, ac_cv_boost_python=no)
+ [[return 0;]]),
+ ac_cv_boost_python=yes, ac_cv_boost_python=no)
AC_LANG_RESTORE
CPPFLAGS=$CPPFLAGS_SAVE
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -35,75 +35,75 @@
AC_DEFUN([AX_BOOST_REGEX],
[
- AC_ARG_WITH([boost-regex],
- AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_regex_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Regex library is available,
- ax_cv_boost_regex,
+ ax_cv_boost_regex,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <boost/regex.hpp>
-
]],
+ 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_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex
library is available])
+ ])
+ if test "x$ax_cv_boost_regex" = "xyes"; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_regex" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -34,82 +34,82 @@
AC_DEFUN([AX_BOOST_SERIALIZATION],
[
- AC_ARG_WITH([boost-serialization],
- AS_HELP_STRING([--with-boost-serialization@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_serialization_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ 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
+ 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
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Serialization library is available,
- ax_cv_boost_serialization,
+ ax_cv_boost_serialization,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <fstream>
-
@%:@include <boost/archive/text_oarchive.hpp>
+ 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;
+ 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_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the
Boost::Serialization library is available])
+ ])
+ if test "x$ax_cv_boost_serialization" = "xyes"; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_serialization" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -35,78 +35,78 @@
AC_DEFUN([AX_BOOST_SIGNALS],
[
- AC_ARG_WITH([boost-signals],
- AS_HELP_STRING([--with-boost-signals@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_signals_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Signals library is available,
- ax_cv_boost_signals,
+ ax_cv_boost_signals,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/signal.hpp>
-
]],
+ 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_DEFINE(HAVE_BOOST_SIGNALS,,[define if the
Boost::Signals library is available])
+ ])
+ if test "x$ax_cv_boost_signals" = "xyes"; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_signals" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -36,83 +36,83 @@
AC_DEFUN([AX_BOOST_SYSTEM],
[
- AC_ARG_WITH([boost-system],
- AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_system_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ 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
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::System library is available,
- ax_cv_boost_system,
+ ax_cv_boost_system,
[AC_LANG_PUSH([C++])
- CXXFLAGS_SAVE=$CXXFLAGS
+ CXXFLAGS_SAVE=$CXXFLAGS
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/system/error_code.hpp>]],
+ 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
+ CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_system" = "xyes"; then
- AC_SUBST(BOOST_CPPFLAGS)
+ ])
+ if test "x$ax_cv_boost_system" = "xyes"; then
+ AC_SUBST(BOOST_CPPFLAGS)
- AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the
Boost::System library is available])
+ AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library
is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- LDFLAGS_SAVE=$LDFLAGS
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_system" = "xno"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4
===================================================================
---
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -35,48 +35,48 @@
AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
[
- AC_ARG_WITH([boost-test-exec-monitor],
- AS_HELP_STRING([--with-boost-test-exec-monitor@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_test_exec_monitor_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ 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,
+ ax_cv_boost_test_exec_monitor,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/test_tools.hpp>]],
+ 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_DEFINE(HAVE_BOOST_TEST_EXEC_MONITOR,,[define if the
Boost::Test_Exec_Monitor library is available])
+ ])
+ if test "x$ax_cv_boost_test_exec_monitor" = "xyes"; then
+ 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}"
+ 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
@@ -87,24 +87,24 @@
link_test_exec_monitor="no"
fi
- if test "x$link_test_exec_monitor" = "xyes"; then
+ 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
+ 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,
+ 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
+ done
fi
else
link_test_exec_monitor="no"
- saved_ldflags="${LDFLAGS}"
+ 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;
@@ -118,20 +118,20 @@
link_test_exec_monitor="no"
fi
- if test "x$link_test_exec_monitor" = "xyes";
then
+ 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
+ break
+ fi
done
done
fi
- if test "x$link_test_exec_monitor" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- fi
+ if test "x$link_test_exec_monitor" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -36,69 +36,69 @@
AC_DEFUN([AX_BOOST_THREAD],
[
- AC_ARG_WITH([boost-thread],
- AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
+ AC_ARG_WITH([boost-thread],
+ AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
[use the Thread library from boost - it is possible to
specify a certain library for the linker
e.g. --with-boost-thread=boost_thread-gcc-mt ]),
[
if test "$withval" = "no"; then
- want_boost="no"
+ want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_thread_lib=""
else
- want_boost="yes"
- ax_boost_user_thread_lib="$withval"
- fi
+ want_boost="yes"
+ ax_boost_user_thread_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_HOST])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::Thread library is available,
- ax_cv_boost_thread,
+ ax_cv_boost_thread,
[AC_LANG_PUSH([C++])
- CXXFLAGS_SAVE=$CXXFLAGS
+ CXXFLAGS_SAVE=$CXXFLAGS
- if test "x$host_os" = "xsolaris" ; then
- CXXFLAGS="-pthreads $CXXFLAGS"
- elif test "x$host_os" = "xming32" ; then
- CXXFLAGS="-mthreads $CXXFLAGS"
- else
- CXXFLAGS="-pthread $CXXFLAGS"
- fi
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/thread/thread.hpp>]],
+ if test "x$host_os" = "xsolaris" ; then
+ CXXFLAGS="-pthreads $CXXFLAGS"
+ elif test "x$host_os" = "xming32" ; then
+ CXXFLAGS="-mthreads $CXXFLAGS"
+ else
+ CXXFLAGS="-pthread $CXXFLAGS"
+ fi
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/thread/thread.hpp>]],
[[boost::thread_group thrds;
return 0;]]),
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
- CXXFLAGS=$CXXFLAGS_SAVE
+ CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_thread" = "xyes"; then
+ ])
+ if test "x$ax_cv_boost_thread" = "xyes"; then
if test "x$host_os" = "xsolaris" ; then
- BOOST_CXXFLAGS="-pthreads $BOOST_CXXFLAGS"
- elif test "x$host_os" = "xming32" ; then
- BOOST_CXXFLAGS="-mthreads $BOOST_CXXFLAGS"
- else
- BOOST_CXXFLAGS="-pthread $BOOST_CXXFLAGS"
- fi
+ BOOST_CXXFLAGS="-pthreads $BOOST_CXXFLAGS"
+ elif test "x$host_os" = "xming32" ; then
+ BOOST_CXXFLAGS="-mthreads $BOOST_CXXFLAGS"
+ else
+ BOOST_CXXFLAGS="-pthread $BOOST_CXXFLAGS"
+ fi
- AC_SUBST(BOOST_CXXFLAGS)
+ AC_SUBST(BOOST_CXXFLAGS)
- AC_DEFINE(HAVE_BOOST_THREAD,,[define if the
Boost::Thread library is available])
+ AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library
is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- LDFLAGS_SAVE=$LDFLAGS
+ LDFLAGS_SAVE=$LDFLAGS
case "x$host_os" in
*bsd* )
LDFLAGS="-pthread $LDFLAGS"
@@ -108,41 +108,41 @@
if test "x$ax_boost_user_thread_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_thread*.{so,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;' -e
's;^lib\(boost_thread.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
+ AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib";
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
- done
+ done
if test "x$link_thread" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_thread*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;' -e
's;^\(boost_thread.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
+ AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib";
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
- done
+ done
fi
else
for ax_lib in $ax_boost_user_thread_lib
boost_thread-$ax_boost_user_thread_lib; do
- AC_CHECK_LIB($ax_lib, exit,
+ AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib";
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
done
fi
- if test "x$link_thread" = "xno"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
+ if test "x$link_thread" = "xno"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
else
case "x$host_os" in
*bsd* )
- BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
+ BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
break;
;;
esac
- fi
- fi
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
===================================================================
---
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -34,49 +34,49 @@
AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
[
- AC_ARG_WITH([boost-unit-test-framework],
- AS_HELP_STRING([--with-boost-unit-test-framework@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_unit_test_framework_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ 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,
+ ax_cv_boost_unit_test_framework,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/unit_test.hpp>]],
+ 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;]]),
+ 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_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if
the Boost::Unit_Test_Framework library is available])
+ ])
+ if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
+ 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}"
+ 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;'`
@@ -86,23 +86,23 @@
link_unit_test_framework="no"
fi
- if test "x$link_unit_test_framework" = "xyes"; then
+ 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
+ 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,
+ 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
+ done
fi
else
link_unit_test_framework="no"
- saved_ldflags="${LDFLAGS}"
+ 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;
@@ -116,20 +116,20 @@
link_unit_test_framework="no"
fi
- if test "x$link_unit_test_framework" = "xyes";
then
+ 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
+ break
+ fi
done
done
fi
- if test "x$link_unit_test_framework" != "xyes"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- fi
+ if test "x$link_unit_test_framework" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
Modified:
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4
2008-07-15 02:24:05 UTC (rev 8887)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4
2008-07-15 02:47:17 UTC (rev 8888)
@@ -34,81 +34,81 @@
AC_DEFUN([AX_BOOST_WSERIALIZATION],
[
- AC_ARG_WITH([boost-wserialization],
- AS_HELP_STRING([--with-boost-wserialization@<:@=special-lib@:>@],
+ 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"
+ 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"
+ ax_boost_user_wserialization_lib="$withval"
+ fi
],
[want_boost="yes"]
- )
+ )
- if test "x$want_boost" = "xyes"; then
+ if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
AC_CACHE_CHECK(whether the Boost::WSerialization library is available,
- ax_cv_boost_wserialization,
+ ax_cv_boost_wserialization,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <fstream>
-
@%:@include <boost/archive/text_oarchive.hpp>
+ 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;
+ 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_DEFINE(HAVE_BOOST_WSERIALIZATION,,[define if the
Boost::WSerialization library is available])
+ ])
+ if test "x$ax_cv_boost_wserialization" = "xyes"; then
+ 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,
+ 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
+ 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,
+ 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
+ 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,
+ 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
- fi
+ if test "x$link_wserialization" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8888 - gnuradio/branches/developers/eb/sched-wip/config,
eb <=