applied patch from #324
This commit is contained in:
Arvid Norberg
parent
f259e34f86
commit
3ea8c933d3
|
|
@ -32,8 +32,10 @@ docs/moopolice_thumb.gif \
|
||||||
docs/qbittorrent_thumb.jpg \
|
docs/qbittorrent_thumb.jpg \
|
||||||
docs/ziptorrent_thumb.gif \
|
docs/ziptorrent_thumb.gif \
|
||||||
docs/unicode_support.png docs/client_test.png docs/style.css Jamfile project-root.jam \
|
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/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/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/README.txt \
|
||||||
bindings/python/Jamfile \
|
bindings/python/Jamfile \
|
||||||
bindings/python/client.py \
|
bindings/python/client.py \
|
||||||
|
|
|
||||||
|
|
@ -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 <mtindal@paradoxpoint.com>
|
|
||||||
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 <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_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 <boost/date_time/gregorian/gregorian_types.hpp>]],
|
|
||||||
[[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
|
|
||||||
|
|
@ -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 <http://randspringer.de/boost/index.html>.
|
||||||
|
#
|
||||||
|
# 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 <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_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 <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])
|
||||||
|
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
|
||||||
|
])
|
||||||
Loading…
Reference in New Issue