From 3ea8c933d35000a80619365fb11496517c5d5787 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 12 May 2008 16:45:51 +0000 Subject: [PATCH] applied patch from #324 --- Makefile.am | 6 ++- m4/ax_boost_date-time.m4 | 52 ------------------ m4/ax_boost_date_time.m4 | 111 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 54 deletions(-) delete mode 100644 m4/ax_boost_date-time.m4 create mode 100644 m4/ax_boost_date_time.m4 diff --git a/Makefile.am b/Makefile.am index 828bf914e..21eeb31dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,8 +32,10 @@ docs/moopolice_thumb.gif \ docs/qbittorrent_thumb.jpg \ docs/ziptorrent_thumb.gif \ docs/unicode_support.png docs/client_test.png docs/style.css Jamfile project-root.jam \ -m4/ac_cxx_namespaces.m4 m4/acx_pthread.m4 m4/ax_boost_date-time.m4 \ -m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 src/file_win.cpp libtorrent.pc \ +m4/ac_cxx_namespaces.m4 m4/acx_pthread.m4 m4/ax_boost_date_time.m4 \ +m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 \ +m4/ax_boost_asio.m4 m4/ax_boost_system.m4 m4/check_ssl.m4 \ +src/file_win.cpp libtorrent.pc \ bindings/README.txt \ bindings/python/Jamfile \ bindings/python/client.py \ diff --git a/m4/ax_boost_date-time.m4 b/m4/ax_boost_date-time.m4 deleted file mode 100644 index baf25ea6d..000000000 --- a/m4/ax_boost_date-time.m4 +++ /dev/null @@ -1,52 +0,0 @@ -dnl @synopsis AX_BOOST_DATE_TIME -dnl -dnl This macro checks to see if the Boost.DateTime 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 -dnl supplied name or suffix and then just the raw library. -dnl -dnl If the library is found, HAVE_BOOST_DATE_TIME is defined and -dnl BOOST_DATE_TIME_LIB is set to the name of the library. -dnl -dnl This macro calls AC_SUBST(BOOST_DATE_TIME_LIB). -dnl -dnl @category InstalledPackages -dnl @author Michael Tindal -dnl @version 2004-09-20 -dnl @license GPLWithACException - -AC_DEFUN([AX_BOOST_DATE_TIME], -[AC_REQUIRE([AC_CXX_NAMESPACES])dnl -AC_CACHE_CHECK(whether the Boost::DateTime library is available, -ax_cv_boost_date_time, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include ]], - [[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_RESTORE -]) -if test "$ax_cv_boost_date_time" = yes; then - AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::DateTime library is available]) - dnl Now determine the appropriate file names - AC_ARG_WITH([boost-date-time],AS_HELP_STRING([--with-boost-date-time], - [specify the boost date-time library or suffix to use]), - [if test "x$with_boost_date_time" != "xno"; then - ax_date_time_lib=$with_boost_date_time - ax_boost_date_time_lib=boost_date_time-$with_boost_date_time - fi]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - for ax_lib in $ax_date_time_lib $ax_boost_date_time_lib boost_date_time-mt boost_date_time; do - ax_save_LIBS="$LIBS" - LIBS="$LIBS -l$ax_lib" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[return 0;]])], - [BOOST_DATE_TIME_LIB=$ax_lib - break]) - LIBS="$ax_save_LIBS" - done - AC_LANG_RESTORE - AC_SUBST(BOOST_DATE_TIME_LIB) -fi -])dnl diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4 new file mode 100644 index 000000000..e890690a0 --- /dev/null +++ b/m4/ax_boost_date_time.m4 @@ -0,0 +1,111 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_boost_date_time.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_DATE_TIME +# +# DESCRIPTION +# +# Test for Date_Time library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_DATE_TIME_LIB) +# +# And sets: +# +# HAVE_BOOST_DATE_TIME +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Thomas Porschberg +# 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_DATE_TIME], +[ + 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" + 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"] + ) + + 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::Date_Time library is available, + ax_cv_boost_date_time, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], + [[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]) + 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, + [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break], + [link_date_time="no"]) + 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, + [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break], + [link_date_time="no"]) + 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, + [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 + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +])