added makefile support for boost.system (#322)
This commit is contained in:
Arvid Norberg
parent
aa626f1422
commit
e51c8bea37
23
configure.in
23
configure.in
|
|
@ -27,21 +27,17 @@ AC_PROG_LIBTOOL
|
||||||
|
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
dnl Make sure that the asio header files are added.
|
|
||||||
ASIO_DIR=$srcdir/include/libtorrent/asio
|
|
||||||
|
|
||||||
if test "$cross_compiling" == "no"; then
|
|
||||||
AC_CHECK_FILES([$ASIO_DIR/../asio.hpp $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp ],,AC_MSG_ERROR([ ASIO header files not found. Get them from asio.sourceforge.net (use CVS head) and include or symlink them. Example: ln -s ../../../asio/include/asio.hpp include/libtorrent/asio.hpp && ln -s ../../../asio/include/asio include/libtorrent/asio ]) )
|
|
||||||
dnl check asio version
|
|
||||||
else
|
|
||||||
AC_MSG_NOTICE([Cross compiling, not checking ASIO headers])
|
|
||||||
fi
|
|
||||||
|
|
||||||
SAVED_LIBS="$LIBS"
|
SAVED_LIBS="$LIBS"
|
||||||
|
|
||||||
dnl Check for pthreads and boost libraries.
|
dnl Check for pthreads and boost libraries.
|
||||||
ACX_PTHREAD
|
ACX_PTHREAD
|
||||||
|
|
||||||
|
AX_BOOST_SYSTEM
|
||||||
|
dnl check that Boost.System was found:
|
||||||
|
if test -z "$BOOST_SYSTEM_LIB"; then
|
||||||
|
AC_MSG_ERROR([unable to find Boost.System library, currently this is required.])
|
||||||
|
fi
|
||||||
|
|
||||||
AX_BOOST_IOSTREAMS
|
AX_BOOST_IOSTREAMS
|
||||||
dnl check that Boost.IOStreams was found:
|
dnl check that Boost.IOStreams was found:
|
||||||
if test -z "$BOOST_IOSTREAMS_LIB"; then
|
if test -z "$BOOST_IOSTREAMS_LIB"; then
|
||||||
|
|
@ -69,6 +65,13 @@ if test -z "$BOOST_THREAD_LIB"; then
|
||||||
AC_MSG_ERROR([Unable to find Boost.Thread library, currently this is required.])
|
AC_MSG_ERROR([Unable to find Boost.Thread library, currently this is required.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AX_BOOST_ASIO
|
||||||
|
|
||||||
|
dnl check that Boost.Asio was found:
|
||||||
|
if test -z "$BOOST_ASIO_LIB"; then
|
||||||
|
AC_MSG_ERROR([Unable to find Boost.Asio library, currently this is required.])
|
||||||
|
fi
|
||||||
|
|
||||||
AX_BOOST_REGEX
|
AX_BOOST_REGEX
|
||||||
|
|
||||||
dnl check that Boost.Regex was found:
|
dnl check that Boost.Regex was found:
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ EXTRA_PROGRAMS = client_test
|
||||||
EXTRA_DIST = Jamfile
|
EXTRA_DIST = Jamfile
|
||||||
|
|
||||||
client_test_SOURCES = client_test.cpp
|
client_test_SOURCES = client_test.cpp
|
||||||
client_test_LDADD = $(top_builddir)/src/libtorrent.la -l@BOOST_REGEX_LIB@ -l@BOOST_PROGRAM_OPTIONS_LIB@
|
client_test_LDADD = $(top_builddir)/src/libtorrent.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@
|
||||||
|
|
||||||
dump_torrent_SOURCES = dump_torrent.cpp
|
dump_torrent_SOURCES = dump_torrent.cpp
|
||||||
dump_torrent_LDADD = $(top_builddir)/src/libtorrent.la
|
dump_torrent_LDADD = $(top_builddir)/src/libtorrent.la
|
||||||
|
|
@ -19,4 +19,4 @@ enum_if_LDADD = $(top_builddir)/src/libtorrent.la
|
||||||
|
|
||||||
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
||||||
|
|
||||||
AM_LDFLAGS= ${LDLAGS} -L./ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_LDFLAGS@ @SSL_LIBS@
|
AM_LDFLAGS= ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_LDFLAGS@ @SSL_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,109 @@
|
||||||
|
# ===========================================================================
|
||||||
|
# http://autoconf-archive.cryp.to/ax_boost_asio.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_BOOST_ASIO
|
||||||
|
#
|
||||||
|
# DESCRIPTION
|
||||||
|
#
|
||||||
|
# Test for Asio 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>.
|
||||||
|
#
|
||||||
|
# This macro calls:
|
||||||
|
#
|
||||||
|
# AC_SUBST(BOOST_ASIO_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_ASIO
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
# Copyright (c) 2008 Pete Greenwell <pete@mu.org>
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
|
AC_DEFUN([AX_BOOST_ASIO],
|
||||||
|
[
|
||||||
|
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"
|
||||||
|
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"]
|
||||||
|
)
|
||||||
|
|
||||||
|
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::ASIO library is available,
|
||||||
|
ax_cv_boost_asio,
|
||||||
|
[AC_LANG_PUSH([C++])
|
||||||
|
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ @%:@include <boost/asio.hpp>
|
||||||
|
]],
|
||||||
|
[[
|
||||||
|
|
||||||
|
boost::asio::io_service io;
|
||||||
|
boost::system::error_code timer_result;
|
||||||
|
boost::asio::deadline_timer t(io);
|
||||||
|
t.cancel();
|
||||||
|
io.run_one();
|
||||||
|
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_boost_user_asio_lib" = "x"; then
|
||||||
|
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],
|
||||||
|
[link_thread="no"])
|
||||||
|
done
|
||||||
|
else
|
||||||
|
for ax_lib in $ax_boost_user_asio_lib $BN-$ax_boost_user_asio_lib; do
|
||||||
|
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
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
@ -1,54 +1,110 @@
|
||||||
dnl @synopsis AX_BOOST_FILESYSTEM
|
# ===========================================================================
|
||||||
dnl
|
# http://autoconf-archive.cryp.to/ax_boost_filesystem.html
|
||||||
dnl This macro checks to see if the Boost.Filesystem library is
|
# ===========================================================================
|
||||||
dnl installed. It also attempts to guess the currect library name using
|
#
|
||||||
dnl several attempts. It tries to build the library name using a user
|
# SYNOPSIS
|
||||||
dnl supplied name or suffix and then just the raw library.
|
#
|
||||||
dnl
|
# AX_BOOST_FILESYSTEM
|
||||||
dnl If the library is found, HAVE_BOOST_FILESYSTEM is defined and
|
#
|
||||||
dnl BOOST_FILESYSTEM_LIB is set to the name of the library.
|
# DESCRIPTION
|
||||||
dnl
|
#
|
||||||
dnl This macro calls AC_SUBST(BOOST_FILESYSTEM_LIB).
|
# Test for Filesystem library from the Boost C++ libraries. The macro
|
||||||
dnl
|
# requires a preceding call to AX_BOOST_BASE. Further documentation is
|
||||||
dnl @category InstalledPackages
|
# available at <http://randspringer.de/boost/index.html>.
|
||||||
dnl @author Michael Tindal <mtindal@paradoxpoint.com>
|
#
|
||||||
dnl @version 2005-05-20
|
# This macro calls:
|
||||||
dnl @license GPLWithACException
|
#
|
||||||
|
# AC_SUBST(BOOST_FILESYSTEM_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_FILESYSTEM
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
# Copyright (c) 2008 Michael Tindal
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_FILESYSTEM],
|
AC_DEFUN([AX_BOOST_FILESYSTEM],
|
||||||
[AC_REQUIRE([AC_CXX_NAMESPACES])dnl
|
[
|
||||||
AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
|
AC_ARG_WITH([boost-filesystem],
|
||||||
ax_cv_boost_filesystem,
|
AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
|
||||||
[AC_LANG_SAVE
|
[use the Filesystem library from boost - it is possible to specify a certain library for the linker
|
||||||
AC_LANG_CPLUSPLUS
|
e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/filesystem/path.hpp>]],
|
[
|
||||||
[[using namespace boost::filesystem;
|
if test "$withval" = "no"; then
|
||||||
path my_path( "foo/bar/data.txt" );
|
want_boost="no"
|
||||||
return 0;]]),
|
elif test "$withval" = "yes"; then
|
||||||
ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
|
want_boost="yes"
|
||||||
AC_LANG_RESTORE
|
ax_boost_user_filesystem_lib=""
|
||||||
|
else
|
||||||
|
want_boost="yes"
|
||||||
|
ax_boost_user_filesystem_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::Filesystem library is available,
|
||||||
|
ax_cv_boost_filesystem,
|
||||||
|
[AC_LANG_PUSH([C++])
|
||||||
|
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@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_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
|
||||||
|
fi
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
if test "$ax_cv_boost_filesystem" = yes; then
|
|
||||||
AC_DEFINE(HAVE_BOOST_FILE,,[define if the Boost::FILESYSTEM library is available])
|
|
||||||
dnl Now determine the appropriate file names
|
|
||||||
AC_ARG_WITH([boost-filesystem],AS_HELP_STRING([--with-boost-filesystem],
|
|
||||||
[specify the boost filesystem library or suffix to use]),
|
|
||||||
[if test "x$with_boost_filesystem" != "xno"; then
|
|
||||||
ax_filesystem_lib=$with_boost_filesystem
|
|
||||||
ax_boost_filesystem_lib=boost_filesystem-$with_boost_filesystem
|
|
||||||
fi])
|
|
||||||
AC_LANG_SAVE
|
|
||||||
AC_LANG_CPLUSPLUS
|
|
||||||
for ax_lib in $ax_filesystem_lib $ax_boost_filesystem_lib boost_filesystem-mt boost_filesystem; do
|
|
||||||
ax_save_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS -l$ax_lib"
|
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/filesystem/path.hpp>]],
|
|
||||||
[[return 0;]])],
|
|
||||||
[BOOST_FILESYSTEM_LIB=$ax_lib
|
|
||||||
break])
|
|
||||||
LIBS="$ax_save_LIBS"
|
|
||||||
done
|
|
||||||
AC_LANG_RESTORE
|
|
||||||
AC_SUBST(BOOST_FILESYSTEM_LIB)
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,114 @@
|
||||||
|
# ===========================================================================
|
||||||
|
# http://autoconf-archive.cryp.to/ax_boost_iostreams.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_BOOST_IOSTREAMS
|
||||||
|
#
|
||||||
|
# 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>.
|
||||||
|
#
|
||||||
|
# This macro calls:
|
||||||
|
#
|
||||||
|
# AC_SUBST(BOOST_IOSTREAMS_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_IOSTREAMS
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_IOSTREAMS],
|
AC_DEFUN([AX_BOOST_IOSTREAMS],
|
||||||
[AC_REQUIRE([AC_CXX_NAMESPACES])dnl
|
[
|
||||||
AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
|
AC_ARG_WITH([boost-iostreams],
|
||||||
ax_cv_boost_iostreams,
|
AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
|
||||||
[AC_LANG_SAVE
|
[use the IOStreams library from boost - it is possible to specify a certain library for the linker
|
||||||
AC_LANG_CPLUSPLUS
|
e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
|
[
|
||||||
@%:@include <boost/range/iterator_range.hpp>]],
|
if test "$withval" = "no"; then
|
||||||
[[std::string input = "Hello World!";namespace io = boost::iostreams;io::filtering_istream in(boost::make_iterator_range(input));return 0;]]
|
want_boost="no"
|
||||||
),
|
elif test "$withval" = "yes"; then
|
||||||
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
|
want_boost="yes"
|
||||||
AC_LANG_RESTORE
|
ax_boost_user_iostreams_lib=""
|
||||||
|
else
|
||||||
|
want_boost="yes"
|
||||||
|
ax_boost_user_iostreams_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::IOStreams library is available,
|
||||||
|
ax_cv_boost_iostreams,
|
||||||
|
[AC_LANG_PUSH([C++])
|
||||||
|
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@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_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
|
||||||
|
fi
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
if test "$ax_cv_boost_iostreams" = yes; then
|
|
||||||
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
|
|
||||||
dnl Now determine the appropriate file names
|
|
||||||
AC_ARG_WITH([boost-iostreams],AS_HELP_STRING([--with-boost-iostreams],
|
|
||||||
[specify the boost iostreams library or suffix to use]),
|
|
||||||
[if test "x$with_boost_iostreams" != "xno"; then
|
|
||||||
ax_iostreams_lib=$with_boost_iostreams
|
|
||||||
ax_boost_iostreams_lib=boost_iostreams-$with_boost_iostreams
|
|
||||||
fi])
|
|
||||||
for ax_lib in $ax_iostreams_lib $ax_boost_iostreams_lib boost_iostreams; do
|
|
||||||
AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB=$ax_lib break])
|
|
||||||
done
|
|
||||||
AC_SUBST(BOOST_IOSTREAMS_LIB)
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
|
|
|
||||||
|
|
@ -1,50 +1,106 @@
|
||||||
dnl @synopsis AX_BOOST_PROGRAM_OPTIONS
|
# ===========================================================================
|
||||||
dnl
|
# http://autoconf-archive.cryp.to/ax_boost_program_options.html
|
||||||
dnl This macro checks to see if the Boost.ProgramOptions library is installed.
|
# ===========================================================================
|
||||||
dnl It also attempts to guess the currect library name using several
|
#
|
||||||
dnl attempts. It tries to build the library name using a user supplied
|
# SYNOPSIS
|
||||||
dnl name or suffix and then just the raw library.
|
#
|
||||||
dnl
|
# AX_BOOST_PROGRAM_OPTIONS
|
||||||
dnl If the library is found, HAVE_BOOST_PROGRAM_OPTIONS is defined and
|
#
|
||||||
dnl BOOST_THREAD_LIB is set to the name of the library.
|
# DESCRIPTION
|
||||||
dnl
|
#
|
||||||
dnl This macro calls AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB).
|
# Test for program options library from the Boost C++ libraries. The macro
|
||||||
dnl
|
# requires a preceding call to AX_BOOST_BASE. Further documentation is
|
||||||
|
# available at <http://randspringer.de/boost/index.html>.
|
||||||
|
#
|
||||||
|
# This macro calls:
|
||||||
|
#
|
||||||
|
# AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_PROGRAM_OPTIONS
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
|
AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
|
||||||
[AC_REQUIRE([AC_CXX_NAMESPACES])dnl
|
[
|
||||||
AC_CACHE_CHECK(whether the Boost::ProgramOptions library is available,
|
AC_ARG_WITH([boost-program-options],
|
||||||
ax_cv_boost_program_options,
|
AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@],
|
||||||
[AC_LANG_SAVE
|
[use the program options library from boost - it is possible to specify a certain library for the linker
|
||||||
AC_LANG_CPLUSPLUS
|
e.g. --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]),
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/program_options.hpp>]],
|
[
|
||||||
[[boost::program_options::options_description desc("test"); return 0;]]),
|
if test "$withval" = "no"; then
|
||||||
ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
|
want_boost="no"
|
||||||
AC_LANG_RESTORE
|
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([[@%:@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])
|
||||||
|
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
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
if test "$ax_cv_boost_program_options" = yes; then
|
|
||||||
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::ProgramOptions library is available])
|
|
||||||
dnl Now determine the appropriate file names
|
|
||||||
AC_ARG_WITH([boost-program_options],AS_HELP_STRING([--with-boost-program_options],
|
|
||||||
[specify the boost program_options library or suffix to use]),
|
|
||||||
[if test "x$with_boost_thread" != "xno"; then
|
|
||||||
ax_program_options_lib=$with_boost_program_options
|
|
||||||
ax_boost_program_options_lib=boost_program_options-$with_boost_program_options
|
|
||||||
fi])
|
|
||||||
AC_LANG_SAVE
|
|
||||||
AC_LANG_CPLUSPLUS
|
|
||||||
for ax_lib in $ax_program_options_lib $ax_boost_program_options_lib boost_program_options-mt boost_program_options; do
|
|
||||||
ax_save_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS -l$ax_lib"
|
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/program_options.hpp>]],
|
|
||||||
[[return 0;]])],
|
|
||||||
[BOOST_PROGRAM_OPTIONS_LIB=$ax_lib
|
|
||||||
break])
|
|
||||||
LIBS="$ax_save_LIBS"
|
|
||||||
done
|
|
||||||
AC_LANG_RESTORE
|
|
||||||
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
|
|
|
||||||
|
|
@ -1,50 +1,110 @@
|
||||||
dnl @synopsis AX_BOOST_REGEX
|
# ===========================================================================
|
||||||
dnl
|
# http://autoconf-archive.cryp.to/ax_boost_regex.html
|
||||||
dnl This macro checks to see if the Boost.Regex library is installed.
|
# ===========================================================================
|
||||||
dnl It also attempts to guess the currect library name using several
|
#
|
||||||
dnl attempts. It tries to build the library name using a user supplied
|
# SYNOPSIS
|
||||||
dnl name or suffix and then just the raw library.
|
#
|
||||||
dnl
|
# AX_BOOST_REGEX
|
||||||
dnl If the library is found, HAVE_BOOST_REGEX is defined and
|
#
|
||||||
dnl BOOST_REGEX_LIB is set to the name of the library.
|
# DESCRIPTION
|
||||||
dnl
|
#
|
||||||
dnl This macro calls AC_SUBST(BOOST_REGEX_LIB).
|
# Test for Regex library from the Boost C++ libraries. The macro requires
|
||||||
dnl
|
# a preceding call to AX_BOOST_BASE. Further documentation is available at
|
||||||
dnl @version $Id$
|
# <http://randspringer.de/boost/index.html>.
|
||||||
dnl @author Michael Tindal <mtindal@paradoxpoint.com>
|
#
|
||||||
dnl
|
# This macro calls:
|
||||||
|
#
|
||||||
|
# AC_SUBST(BOOST_REGEX_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_REGEX
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
# Copyright (c) 2008 Michael Tindal
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_REGEX],
|
AC_DEFUN([AX_BOOST_REGEX],
|
||||||
[AC_REQUIRE([AC_CXX_NAMESPACES])dnl
|
[
|
||||||
AC_CACHE_CHECK(whether the Boost::Regex library is available,
|
AC_ARG_WITH([boost-regex],
|
||||||
ax_cv_boost_regex,
|
AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
|
||||||
[AC_LANG_SAVE
|
[use the Regex library from boost - it is possible to specify a certain library for the linker
|
||||||
AC_LANG_CPLUSPLUS
|
e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]),
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/regex.hpp>]],
|
[
|
||||||
[[boost::regex r(); return 0;]]),
|
if test "$withval" = "no"; then
|
||||||
ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
|
want_boost="no"
|
||||||
AC_LANG_RESTORE
|
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([[@%:@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])
|
||||||
|
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
|
||||||
|
fi
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
if test "$ax_cv_boost_regex" = yes; then
|
|
||||||
AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
|
|
||||||
dnl Now determine the appropriate file names
|
|
||||||
AC_ARG_WITH([boost-regex],AS_HELP_STRING([--with-boost-regex],
|
|
||||||
[specify the boost regex library or suffix to use]),
|
|
||||||
[if test "x$with_boost_regex" != "xno"; then
|
|
||||||
ax_regex_lib=$with_boost_regex
|
|
||||||
ax_boost_regex_lib=boost_regex-$with_boost_regex
|
|
||||||
fi])
|
|
||||||
AC_LANG_SAVE
|
|
||||||
AC_LANG_CPLUSPLUS
|
|
||||||
for ax_lib in $ax_regex_lib $ax_boost_regex_lib boost_regex-mt boost_regex; do
|
|
||||||
ax_save_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS -l$ax_lib"
|
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/regex.hpp>]],
|
|
||||||
[[return 0;]])],
|
|
||||||
[BOOST_REGEX_LIB=$ax_lib
|
|
||||||
break])
|
|
||||||
LIBS="$ax_save_LIBS"
|
|
||||||
done
|
|
||||||
AC_LANG_RESTORE
|
|
||||||
AC_SUBST(BOOST_REGEX_LIB)
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,118 @@
|
||||||
|
# ===========================================================================
|
||||||
|
# http://autoconf-archive.cryp.to/ax_boost_system.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_BOOST_SYSTEM
|
||||||
|
#
|
||||||
|
# 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>.
|
||||||
|
#
|
||||||
|
# This macro calls:
|
||||||
|
#
|
||||||
|
# AC_SUBST(BOOST_SYSTEM_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_SYSTEM
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
# Copyright (c) 2008 Michael Tindal
|
||||||
|
# Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
|
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([[@%:@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_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
|
||||||
|
fi
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
@ -1,57 +1,147 @@
|
||||||
dnl @synopsis AX_BOOST_THREAD
|
# ===========================================================================
|
||||||
dnl
|
# http://autoconf-archive.cryp.to/ax_boost_thread.html
|
||||||
dnl This macro checks to see if the Boost.Thread library is installed.
|
# ===========================================================================
|
||||||
dnl It also attempts to guess the currect library name using several
|
#
|
||||||
dnl attempts. It tries to build the library name using a user supplied
|
# SYNOPSIS
|
||||||
dnl name or suffix and then just the raw library.
|
#
|
||||||
dnl
|
# AX_BOOST_THREAD
|
||||||
dnl If the library is found, HAVE_BOOST_THREAD is defined and
|
#
|
||||||
dnl BOOST_THREAD_LIB is set to the name of the library.
|
# DESCRIPTION
|
||||||
dnl
|
#
|
||||||
dnl This macro calls AC_SUBST(BOOST_THREAD_LIB).
|
# Test for Thread library from the Boost C++ libraries. The macro requires
|
||||||
dnl
|
# a preceding call to AX_BOOST_BASE. Further documentation is available at
|
||||||
dnl @category InstalledPackages
|
# <http://randspringer.de/boost/index.html>.
|
||||||
dnl @author Michael Tindal <mtindal@paradoxpoint.com>
|
#
|
||||||
dnl @version 2004-09-20
|
# This macro calls:
|
||||||
dnl @license GPLWithACException
|
#
|
||||||
|
# AC_SUBST(BOOST_THREAD_LIB)
|
||||||
|
#
|
||||||
|
# And sets:
|
||||||
|
#
|
||||||
|
# HAVE_BOOST_THREAD
|
||||||
|
#
|
||||||
|
# LAST MODIFICATION
|
||||||
|
#
|
||||||
|
# 2008-04-12
|
||||||
|
#
|
||||||
|
# COPYLEFT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
# Copyright (c) 2008 Michael Tindal
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved.
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_THREAD],
|
AC_DEFUN([AX_BOOST_THREAD],
|
||||||
[AC_REQUIRE([AC_CXX_NAMESPACES])dnl
|
[
|
||||||
AC_CACHE_CHECK(whether the Boost::Thread library is available,
|
AC_ARG_WITH([boost-thread],
|
||||||
ax_cv_boost_thread,
|
AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
|
||||||
[AC_LANG_SAVE
|
[use the Thread library from boost - it is possible to specify a certain library for the linker
|
||||||
AC_LANG_CPLUSPLUS
|
e.g. --with-boost-thread=boost_thread-gcc-mt ]),
|
||||||
CXXFLAGS_SAVE=$CXXFLAGS
|
[
|
||||||
dnl FIXME: need to include a generic way to check for the flag
|
if test "$withval" = "no"; then
|
||||||
dnl to turn on threading support.
|
want_boost="no"
|
||||||
CXXFLAGS="-pthread $CXXFLAGS"
|
elif test "$withval" = "yes"; then
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/thread/thread.hpp>]],
|
want_boost="yes"
|
||||||
[[boost::thread_group thrds; return 0;]]),
|
ax_boost_user_thread_lib=""
|
||||||
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
|
else
|
||||||
CXXFLAGS=$CXXFLAGS_SAVE
|
want_boost="yes"
|
||||||
AC_LANG_RESTORE
|
ax_boost_user_thread_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::Thread library is available,
|
||||||
|
ax_cv_boost_thread,
|
||||||
|
[AC_LANG_PUSH([C++])
|
||||||
|
CXXFLAGS_SAVE=$CXXFLAGS
|
||||||
|
|
||||||
|
if test "x$build_os" = "xsolaris" ; then
|
||||||
|
CXXFLAGS="-pthreads $CXXFLAGS"
|
||||||
|
elif test "x$build_os" = "xming32" ; then
|
||||||
|
CXXFLAGS="-mthreads $CXXFLAGS"
|
||||||
|
else
|
||||||
|
CXXFLAGS="-pthread $CXXFLAGS"
|
||||||
|
fi
|
||||||
|
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
|
||||||
|
[[boost::thread_group thrds;
|
||||||
|
return 0;]]),
|
||||||
|
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
|
||||||
|
CXXFLAGS=$CXXFLAGS_SAVE
|
||||||
|
AC_LANG_POP([C++])
|
||||||
|
])
|
||||||
|
if test "x$ax_cv_boost_thread" = "xyes"; then
|
||||||
|
if test "x$build_os" = "xsolaris" ; then
|
||||||
|
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
|
||||||
|
elif test "x$build_os" = "xming32" ; then
|
||||||
|
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
|
||||||
|
else
|
||||||
|
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(BOOST_CPPFLAGS)
|
||||||
|
|
||||||
|
AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available])
|
||||||
|
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
||||||
|
|
||||||
|
LDFLAGS_SAVE=$LDFLAGS
|
||||||
|
case "x$build_os" in
|
||||||
|
*bsd* )
|
||||||
|
LDFLAGS="-pthread $LDFLAGS"
|
||||||
|
break;
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
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,
|
||||||
|
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
|
||||||
|
[link_thread="no"])
|
||||||
|
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,
|
||||||
|
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
|
||||||
|
[link_thread="no"])
|
||||||
|
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,
|
||||||
|
[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 !)
|
||||||
|
else
|
||||||
|
case "x$build_os" in
|
||||||
|
*bsd* )
|
||||||
|
BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
|
||||||
|
break;
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
if test "$ax_cv_boost_thread" = yes; then
|
|
||||||
AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available])
|
|
||||||
dnl Now determine the appropriate file names
|
|
||||||
AC_ARG_WITH([boost-thread],AS_HELP_STRING([--with-boost-thread],
|
|
||||||
[specify the boost thread library or suffix to use]),
|
|
||||||
[if test "x$with_boost_thread" != "xno"; then
|
|
||||||
ax_thread_lib=$with_boost_thread
|
|
||||||
ax_boost_thread_lib=boost_thread-$with_boost_thread
|
|
||||||
fi])
|
|
||||||
AC_LANG_SAVE
|
|
||||||
AC_LANG_CPLUSPLUS
|
|
||||||
for ax_lib in $ax_thread_lib $ax_boost_thread_lib boost_thread-mt boost_thread; do
|
|
||||||
ax_save_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS -l$ax_lib"
|
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/thread/thread.hpp>]],
|
|
||||||
[[return 0;]])],
|
|
||||||
[BOOST_THREAD_LIB=$ax_lib
|
|
||||||
break])
|
|
||||||
LIBS="$ax_save_LIBS"
|
|
||||||
done
|
|
||||||
AC_LANG_RESTORE
|
|
||||||
AC_SUBST(BOOST_THREAD_LIB)
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
|
|
|
||||||
|
|
@ -98,9 +98,9 @@ $(top_srcdir)/include/libtorrent/version.hpp
|
||||||
|
|
||||||
|
|
||||||
libtorrent_la_LDFLAGS = $(LDFLAGS) -release @VERSION@
|
libtorrent_la_LDFLAGS = $(LDFLAGS) -release @VERSION@
|
||||||
libtorrent_la_LIBADD = @ZLIB@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
|
libtorrent_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
|
||||||
|
|
||||||
AM_CXXFLAGS= -ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@
|
AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@
|
||||||
AM_CFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@
|
AM_CFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@
|
||||||
AM_LDFLAGS= $(LDFLAGS) -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
AM_LDFLAGS= $(LDFLAGS) @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -59,4 +59,4 @@ test_bandwidth_limiter_LDADD = $(top_builddir)/src/libtorrent.la
|
||||||
noinst_HEADERS = test.hpp setup_transfer.hpp
|
noinst_HEADERS = test.hpp setup_transfer.hpp
|
||||||
|
|
||||||
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
||||||
AM_LDFLAGS= -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
AM_LDFLAGS= @BOOST_SYSTEM_LIB@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue