mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
Use newer m4 macros to detect libboost. This should fix the lib64/ issue seen on OpenSUSE.
This commit is contained in:
Frank Zago
@@ -35,11 +35,6 @@ Create a directory /YOUR_INSTALL_PATH/vcmi (such as
|
|||||||
Then run configure:
|
Then run configure:
|
||||||
./configure --datadir=/YOUR_INSTALL_PATH/ --bindir=/YOUR_INSTALL_PATH/vcmi --libdir=/YOUR_INSTALL_PATH/
|
./configure --datadir=/YOUR_INSTALL_PATH/ --bindir=/YOUR_INSTALL_PATH/vcmi --libdir=/YOUR_INSTALL_PATH/
|
||||||
|
|
||||||
On 64 bits linux (such as OpenSUSE but not Ubuntu), if the boost
|
|
||||||
libraries are installed in /usr/lib64, configure will not find them
|
|
||||||
and will fail. Until this is fixed, add the following option to
|
|
||||||
./configure: --with-boost-libdir=/usr/lib64
|
|
||||||
|
|
||||||
If you want to use the Intel C++ compiler, add the following option to ./configure:
|
If you want to use the Intel C++ compiler, add the following option to ./configure:
|
||||||
CXX="icc -diag-disable 383,981,1418,869,1563,2259,1782,444,271,1,10156,1419"
|
CXX="icc -diag-disable 383,981,1418,869,1563,2259,1782,444,271,1,10156,1419"
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
# http://autoconf-archive.cryp.to/ax_boost_base.html
|
# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
#
|
#
|
||||||
# AX_BOOST_BASE([MINIMUM-VERSION])
|
# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||||
#
|
#
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
#
|
#
|
||||||
@@ -23,41 +23,45 @@
|
|||||||
#
|
#
|
||||||
# HAVE_BOOST
|
# HAVE_BOOST
|
||||||
#
|
#
|
||||||
# LAST MODIFICATION
|
# LICENSE
|
||||||
#
|
|
||||||
# 2008-04-12
|
|
||||||
#
|
|
||||||
# COPYLEFT
|
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
|
# Copyright (c) 2009 Peter Adolphs
|
||||||
#
|
#
|
||||||
# Copying and distribution of this file, with or without modification, are
|
# Copying and distribution of this file, with or without modification, are
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
# and this notice are preserved.
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
|
# warranty.
|
||||||
|
|
||||||
|
#serial 20
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_BASE],
|
AC_DEFUN([AX_BOOST_BASE],
|
||||||
[
|
[
|
||||||
AC_ARG_WITH([boost],
|
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@<:@=ARG@:>@],
|
||||||
[
|
[use Boost library from a standard location (ARG=yes),
|
||||||
|
from the specified location (ARG=<path>),
|
||||||
|
or disable it (ARG=no)
|
||||||
|
@<:@ARG=yes@:>@ ])],
|
||||||
|
[
|
||||||
if test "$withval" = "no"; then
|
if test "$withval" = "no"; then
|
||||||
want_boost="no"
|
want_boost="no"
|
||||||
elif test "$withval" = "yes"; then
|
elif test "$withval" = "yes"; then
|
||||||
want_boost="yes"
|
want_boost="yes"
|
||||||
ac_boost_path=""
|
ac_boost_path=""
|
||||||
else
|
else
|
||||||
want_boost="yes"
|
want_boost="yes"
|
||||||
ac_boost_path="$withval"
|
ac_boost_path="$withval"
|
||||||
fi
|
fi
|
||||||
],
|
],
|
||||||
[want_boost="yes"])
|
[want_boost="yes"])
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_WITH([boost-libdir],
|
AC_ARG_WITH([boost-libdir],
|
||||||
AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
|
AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
|
||||||
[Force given directory for boost libraries. Note that this will overwrite library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
|
[Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
|
||||||
[
|
[
|
||||||
if test -d $withval
|
if test -d "$withval"
|
||||||
then
|
then
|
||||||
ac_boost_lib_path="$withval"
|
ac_boost_lib_path="$withval"
|
||||||
else
|
else
|
||||||
@@ -68,33 +72,52 @@ AC_ARG_WITH([boost-libdir],
|
|||||||
)
|
)
|
||||||
|
|
||||||
if test "x$want_boost" = "xyes"; then
|
if test "x$want_boost" = "xyes"; then
|
||||||
boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
|
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_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_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_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]]*\)'`
|
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
|
if test "x$boost_lib_version_req_sub_minor" = "x" ; then
|
||||||
boost_lib_version_req_sub_minor="0"
|
boost_lib_version_req_sub_minor="0"
|
||||||
fi
|
fi
|
||||||
WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
|
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)
|
AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
|
||||||
succeeded=no
|
succeeded=no
|
||||||
|
|
||||||
dnl first we check the system location for boost libraries
|
dnl On 64-bit systems check for system libraries in both lib64 and lib.
|
||||||
dnl this location ist chosen if boost libraries are installed with the --layout=system option
|
dnl The former is specified by FHS, but e.g. Debian does not adhere to
|
||||||
dnl or if you install boost with RPM
|
dnl this (as it rises problems for generic multi-arch support).
|
||||||
if test "$ac_boost_path" != ""; then
|
dnl The last entry in the list is chosen by default when no libraries
|
||||||
BOOST_LDFLAGS="-L$ac_boost_path/lib"
|
dnl are found, e.g. when only header-only libraries are installed!
|
||||||
BOOST_CPPFLAGS="-I$ac_boost_path/include"
|
libsubdirs="lib"
|
||||||
else
|
ax_arch=`uname -m`
|
||||||
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
|
if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
|
||||||
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
|
libsubdirs="lib64 lib lib64"
|
||||||
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
|
fi
|
||||||
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
|
|
||||||
break;
|
dnl first we check the system location for boost libraries
|
||||||
fi
|
dnl this location ist chosen if boost libraries are installed with the --layout=system option
|
||||||
done
|
dnl or if you install boost with RPM
|
||||||
fi
|
if test "$ac_boost_path" != ""; then
|
||||||
|
BOOST_CPPFLAGS="-I$ac_boost_path/include"
|
||||||
|
for ac_boost_path_tmp in $libsubdirs; do
|
||||||
|
if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
|
||||||
|
BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
elif test "$cross_compiling" != yes; then
|
||||||
|
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
|
||||||
|
for libsubdir in $libsubdirs ; do
|
||||||
|
if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
|
||||||
|
done
|
||||||
|
BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
|
||||||
|
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
|
||||||
|
break;
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
dnl overwrite ld flags if we have required special directory with
|
dnl overwrite ld flags if we have required special directory with
|
||||||
dnl --with-boost-libdir parameter
|
dnl --with-boost-libdir parameter
|
||||||
@@ -102,122 +125,134 @@ if test "x$want_boost" = "xyes"; then
|
|||||||
BOOST_LDFLAGS="-L$ac_boost_lib_path"
|
BOOST_LDFLAGS="-L$ac_boost_lib_path"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS_SAVED="$CPPFLAGS"
|
CPPFLAGS_SAVED="$CPPFLAGS"
|
||||||
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
||||||
export CPPFLAGS
|
export CPPFLAGS
|
||||||
|
|
||||||
LDFLAGS_SAVED="$LDFLAGS"
|
LDFLAGS_SAVED="$LDFLAGS"
|
||||||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
|
|
||||||
AC_LANG_PUSH(C++)
|
AC_REQUIRE([AC_PROG_CXX])
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
AC_LANG_PUSH(C++)
|
||||||
@%:@include <boost/version.hpp>
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
]], [[
|
@%:@include <boost/version.hpp>
|
||||||
#if BOOST_VERSION >= $WANT_BOOST_VERSION
|
]], [[
|
||||||
// Everything is okay
|
#if BOOST_VERSION >= $WANT_BOOST_VERSION
|
||||||
#else
|
// Everything is okay
|
||||||
# error Boost version is too old
|
#else
|
||||||
#endif
|
# error Boost version is too old
|
||||||
]])],[
|
#endif
|
||||||
|
]])],[
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
succeeded=yes
|
succeeded=yes
|
||||||
found_system=yes
|
found_system=yes
|
||||||
],[
|
],[
|
||||||
])
|
])
|
||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dnl if we found no boost with system layout we search for boost libraries
|
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
|
dnl built and installed without the --layout=system option or for a staged(not installed) version
|
||||||
if test "x$succeeded" != "xyes"; then
|
if test "x$succeeded" != "xyes"; then
|
||||||
_version=0
|
_version=0
|
||||||
if test "$ac_boost_path" != ""; then
|
if test "$ac_boost_path" != ""; then
|
||||||
if test -d "$ac_boost_path" && test -r "$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
|
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/_/./'`
|
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
|
||||||
V_CHECK=`expr $_version_tmp \> $_version`
|
V_CHECK=`expr $_version_tmp \> $_version`
|
||||||
if test "$V_CHECK" = "1" ; then
|
if test "$V_CHECK" = "1" ; then
|
||||||
_version=$_version_tmp
|
_version=$_version_tmp
|
||||||
fi
|
fi
|
||||||
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
||||||
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
|
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
for ac_boost_path in /usr /usr/local /opt /opt/local ; do
|
if test "$cross_compiling" != yes; then
|
||||||
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
|
for ac_boost_path in /usr /usr/local /opt /opt/local ; do
|
||||||
for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
|
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
|
||||||
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
|
for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
|
||||||
V_CHECK=`expr $_version_tmp \> $_version`
|
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
|
||||||
if test "$V_CHECK" = "1" ; then
|
V_CHECK=`expr $_version_tmp \> $_version`
|
||||||
_version=$_version_tmp
|
if test "$V_CHECK" = "1" ; then
|
||||||
best_path=$ac_boost_path
|
_version=$_version_tmp
|
||||||
fi
|
best_path=$ac_boost_path
|
||||||
done
|
fi
|
||||||
fi
|
done
|
||||||
done
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
||||||
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
|
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
|
||||||
if test "$ac_boost_lib_path" = ""
|
if test "$ac_boost_lib_path" = ""; then
|
||||||
then
|
for libsubdir in $libsubdirs ; do
|
||||||
BOOST_LDFLAGS="-L$best_path/lib"
|
if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
|
||||||
|
done
|
||||||
|
BOOST_LDFLAGS="-L$best_path/$libsubdir"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$BOOST_ROOT" != "x"; then
|
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
|
for libsubdir in $libsubdirs ; do
|
||||||
version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
|
if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
|
||||||
stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
|
done
|
||||||
stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
|
if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
|
||||||
V_CHECK=`expr $stage_version_shorten \>\= $_version`
|
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
|
if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
|
||||||
AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
|
AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
|
||||||
BOOST_CPPFLAGS="-I$BOOST_ROOT"
|
BOOST_CPPFLAGS="-I$BOOST_ROOT"
|
||||||
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
|
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
||||||
export CPPFLAGS
|
export CPPFLAGS
|
||||||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
|
|
||||||
AC_LANG_PUSH(C++)
|
AC_LANG_PUSH(C++)
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
@%:@include <boost/version.hpp>
|
@%:@include <boost/version.hpp>
|
||||||
]], [[
|
]], [[
|
||||||
#if BOOST_VERSION >= $WANT_BOOST_VERSION
|
#if BOOST_VERSION >= $WANT_BOOST_VERSION
|
||||||
// Everything is okay
|
// Everything is okay
|
||||||
#else
|
#else
|
||||||
# error Boost version is too old
|
# error Boost version is too old
|
||||||
#endif
|
#endif
|
||||||
]])],[
|
]])],[
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
succeeded=yes
|
succeeded=yes
|
||||||
found_system=yes
|
found_system=yes
|
||||||
],[
|
],[
|
||||||
])
|
])
|
||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$succeeded" != "yes" ; then
|
if test "$succeeded" != "yes" ; then
|
||||||
if test "$_version" = "0" ; 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.]])
|
AC_MSG_NOTICE([[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
|
else
|
||||||
AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
|
AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
|
||||||
fi
|
fi
|
||||||
else
|
# execute ACTION-IF-NOT-FOUND (if present):
|
||||||
AC_SUBST(BOOST_CPPFLAGS)
|
ifelse([$3], , :, [$3])
|
||||||
AC_SUBST(BOOST_LDFLAGS)
|
else
|
||||||
AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
|
AC_SUBST(BOOST_CPPFLAGS)
|
||||||
fi
|
AC_SUBST(BOOST_LDFLAGS)
|
||||||
|
AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
|
||||||
|
# execute ACTION-IF-FOUND (if present):
|
||||||
|
ifelse([$2], , :, [$2])
|
||||||
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
LDFLAGS="$LDFLAGS_SAVED"
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
# http://autoconf-archive.cryp.to/ax_boost_filesystem.html
|
# http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
@@ -20,18 +20,18 @@
|
|||||||
#
|
#
|
||||||
# HAVE_BOOST_FILESYSTEM
|
# HAVE_BOOST_FILESYSTEM
|
||||||
#
|
#
|
||||||
# LAST MODIFICATION
|
# LICENSE
|
||||||
#
|
#
|
||||||
# 2008-04-12
|
# Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
|
||||||
#
|
# Copyright (c) 2009 Michael Tindal
|
||||||
# COPYLEFT
|
# Copyright (c) 2009 Roman Rybalko <libtorrent@romanr.info>
|
||||||
#
|
|
||||||
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
|
||||||
# Copyright (c) 2008 Michael Tindal
|
|
||||||
#
|
#
|
||||||
# Copying and distribution of this file, with or without modification, are
|
# Copying and distribution of this file, with or without modification, are
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
# and this notice are preserved.
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
|
# warranty.
|
||||||
|
|
||||||
|
#serial 21
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_FILESYSTEM],
|
AC_DEFUN([AX_BOOST_FILESYSTEM],
|
||||||
[
|
[
|
||||||
@@ -47,7 +47,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
|
|||||||
ax_boost_user_filesystem_lib=""
|
ax_boost_user_filesystem_lib=""
|
||||||
else
|
else
|
||||||
want_boost="yes"
|
want_boost="yes"
|
||||||
ax_boost_user_filesystem_lib="$withval"
|
ax_boost_user_filesystem_lib="$withval"
|
||||||
fi
|
fi
|
||||||
],
|
],
|
||||||
[want_boost="yes"]
|
[want_boost="yes"]
|
||||||
@@ -63,34 +63,38 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
|
|||||||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
|
|
||||||
|
LIBS_SAVED=$LIBS
|
||||||
|
LIBS="$LIBS $BOOST_SYSTEM_LIB"
|
||||||
|
export LIBS
|
||||||
|
|
||||||
AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
|
AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
|
||||||
ax_cv_boost_filesystem,
|
ax_cv_boost_filesystem,
|
||||||
[AC_LANG_PUSH([C++])
|
[AC_LANG_PUSH([C++])
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
|
||||||
[[using namespace boost::filesystem;
|
[[using namespace boost::filesystem;
|
||||||
path my_path( "foo/bar/data.txt" );
|
path my_path( "foo/bar/data.txt" );
|
||||||
return 0;]]),
|
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++])
|
AC_LANG_POP([C++])
|
||||||
])
|
])
|
||||||
if test "x$ax_cv_boost_filesystem" = "xyes"; then
|
if test "x$ax_cv_boost_filesystem" = "xyes"; then
|
||||||
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
|
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
|
||||||
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
||||||
if test "x$ax_boost_user_filesystem_lib" = "x"; then
|
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
|
for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do
|
||||||
ax_lib=${libextension}
|
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],
|
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
|
||||||
[link_filesystem="no"])
|
[link_filesystem="no"])
|
||||||
done
|
done
|
||||||
if test "x$link_program_options" != "xyes"; then
|
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
|
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}
|
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],
|
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
|
||||||
[link_filesystem="no"])
|
[link_filesystem="no"])
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
|
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,
|
||||||
@@ -98,6 +102,9 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
|
|||||||
[link_filesystem="no"])
|
[link_filesystem="no"])
|
||||||
done
|
done
|
||||||
|
|
||||||
|
fi
|
||||||
|
if test "x$ax_lib" = "x"; then
|
||||||
|
AC_MSG_ERROR(Could not find a version of the library!)
|
||||||
fi
|
fi
|
||||||
if test "x$link_filesystem" != "xyes"; then
|
if test "x$link_filesystem" != "xyes"; then
|
||||||
AC_MSG_ERROR(Could not link against $ax_lib !)
|
AC_MSG_ERROR(Could not link against $ax_lib !)
|
||||||
@@ -105,6 +112,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
LDFLAGS="$LDFLAGS_SAVED"
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
LIBS="$LIBS_SAVED"
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -1,114 +1,116 @@
|
|||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
# http://autoconf-archive.cryp.to/ax_boost_iostreams.html
|
# http://www.gnu.org/software/autoconf-archive/ax_boost_iostreams.html
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
#
|
#
|
||||||
# AX_BOOST_IOSTREAMS
|
# AX_BOOST_IOSTREAMS
|
||||||
#
|
#
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
#
|
#
|
||||||
# Test for IOStreams library from the Boost C++ libraries. The macro
|
# Test for IOStreams library from the Boost C++ libraries. The macro
|
||||||
# requires a preceding call to AX_BOOST_BASE. Further documentation is
|
# requires a preceding call to AX_BOOST_BASE. Further documentation is
|
||||||
# available at <http://randspringer.de/boost/index.html>.
|
# available at <http://randspringer.de/boost/index.html>.
|
||||||
#
|
#
|
||||||
# This macro calls:
|
# This macro calls:
|
||||||
#
|
#
|
||||||
# AC_SUBST(BOOST_IOSTREAMS_LIB)
|
# AC_SUBST(BOOST_IOSTREAMS_LIB)
|
||||||
#
|
#
|
||||||
# And sets:
|
# And sets:
|
||||||
#
|
#
|
||||||
# HAVE_BOOST_IOSTREAMS
|
# HAVE_BOOST_IOSTREAMS
|
||||||
#
|
#
|
||||||
# LAST MODIFICATION
|
# LICENSE
|
||||||
#
|
#
|
||||||
# 2008-04-12
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
#
|
#
|
||||||
# COPYLEFT
|
# Copying and distribution of this file, with or without modification, are
|
||||||
#
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
#
|
# warranty.
|
||||||
# Copying and distribution of this file, with or without modification, are
|
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
#serial 18
|
||||||
# and this notice are preserved.
|
|
||||||
|
AC_DEFUN([AX_BOOST_IOSTREAMS],
|
||||||
AC_DEFUN([AX_BOOST_IOSTREAMS],
|
[
|
||||||
[
|
AC_ARG_WITH([boost-iostreams],
|
||||||
AC_ARG_WITH([boost-iostreams],
|
AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
|
||||||
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
|
||||||
[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 ]),
|
||||||
e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
|
[
|
||||||
[
|
if test "$withval" = "no"; then
|
||||||
if test "$withval" = "no"; then
|
want_boost="no"
|
||||||
want_boost="no"
|
elif test "$withval" = "yes"; then
|
||||||
elif test "$withval" = "yes"; then
|
want_boost="yes"
|
||||||
want_boost="yes"
|
ax_boost_user_iostreams_lib=""
|
||||||
ax_boost_user_iostreams_lib=""
|
else
|
||||||
else
|
want_boost="yes"
|
||||||
want_boost="yes"
|
ax_boost_user_iostreams_lib="$withval"
|
||||||
ax_boost_user_iostreams_lib="$withval"
|
fi
|
||||||
fi
|
],
|
||||||
],
|
[want_boost="yes"]
|
||||||
[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_PROG_CC])
|
CPPFLAGS_SAVED="$CPPFLAGS"
|
||||||
CPPFLAGS_SAVED="$CPPFLAGS"
|
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
||||||
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
export CPPFLAGS
|
||||||
export CPPFLAGS
|
|
||||||
|
LDFLAGS_SAVED="$LDFLAGS"
|
||||||
LDFLAGS_SAVED="$LDFLAGS"
|
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
||||||
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
|
export LDFLAGS
|
||||||
export LDFLAGS
|
|
||||||
|
AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
|
||||||
AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
|
ax_cv_boost_iostreams,
|
||||||
ax_cv_boost_iostreams,
|
[AC_LANG_PUSH([C++])
|
||||||
[AC_LANG_PUSH([C++])
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
|
@%:@include <boost/range/iterator_range.hpp>
|
||||||
@%:@include <boost/range/iterator_range.hpp>
|
]],
|
||||||
]],
|
[[std::string input = "Hello World!";
|
||||||
[[std::string input = "Hello World!";
|
namespace io = boost::iostreams;
|
||||||
namespace io = boost::iostreams;
|
io::filtering_istream in(boost::make_iterator_range(input));
|
||||||
io::filtering_istream in(boost::make_iterator_range(input));
|
return 0;
|
||||||
return 0;
|
]])],
|
||||||
]]),
|
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
|
||||||
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
|
AC_LANG_POP([C++])
|
||||||
AC_LANG_POP([C++])
|
])
|
||||||
])
|
if test "x$ax_cv_boost_iostreams" = "xyes"; then
|
||||||
if test "x$ax_cv_boost_iostreams" = "xyes"; then
|
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
|
||||||
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
|
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
||||||
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
if test "x$ax_boost_user_iostreams_lib" = "x"; then
|
||||||
if test "x$ax_boost_user_iostreams_lib" = "x"; then
|
for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a*$;\1;'` ; do
|
||||||
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}
|
||||||
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],
|
||||||
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
|
[link_iostreams="no"])
|
||||||
[link_iostreams="no"])
|
done
|
||||||
done
|
if test "x$link_iostreams" != "xyes"; then
|
||||||
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
|
||||||
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}
|
||||||
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],
|
||||||
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
|
[link_iostreams="no"])
|
||||||
[link_iostreams="no"])
|
done
|
||||||
done
|
fi
|
||||||
fi
|
|
||||||
|
else
|
||||||
else
|
for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
|
||||||
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],
|
||||||
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
|
[link_iostreams="no"])
|
||||||
[link_iostreams="no"])
|
done
|
||||||
done
|
|
||||||
|
fi
|
||||||
fi
|
if test "x$ax_lib" = "x"; then
|
||||||
if test "x$link_iostreams" != "xyes"; then
|
AC_MSG_ERROR(Could not find a version of the library!)
|
||||||
AC_MSG_ERROR(Could not link against $ax_lib !)
|
fi
|
||||||
fi
|
if test "x$link_iostreams" != "xyes"; then
|
||||||
fi
|
AC_MSG_ERROR(Could not link against $ax_lib !)
|
||||||
|
fi
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
fi
|
||||||
LDFLAGS="$LDFLAGS_SAVED"
|
|
||||||
fi
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
])
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
# http://autoconf-archive.cryp.to/ax_boost_system.html
|
# http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
@@ -20,11 +20,7 @@
|
|||||||
#
|
#
|
||||||
# HAVE_BOOST_SYSTEM
|
# HAVE_BOOST_SYSTEM
|
||||||
#
|
#
|
||||||
# LAST MODIFICATION
|
# LICENSE
|
||||||
#
|
|
||||||
# 2008-04-12
|
|
||||||
#
|
|
||||||
# COPYLEFT
|
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
|
||||||
# Copyright (c) 2008 Michael Tindal
|
# Copyright (c) 2008 Michael Tindal
|
||||||
@@ -32,7 +28,10 @@
|
|||||||
#
|
#
|
||||||
# Copying and distribution of this file, with or without modification, are
|
# Copying and distribution of this file, with or without modification, are
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
# and this notice are preserved.
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
|
# warranty.
|
||||||
|
|
||||||
|
#serial 14
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_SYSTEM],
|
AC_DEFUN([AX_BOOST_SYSTEM],
|
||||||
[
|
[
|
||||||
@@ -48,7 +47,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
ax_boost_user_system_lib=""
|
ax_boost_user_system_lib=""
|
||||||
else
|
else
|
||||||
want_boost="yes"
|
want_boost="yes"
|
||||||
ax_boost_user_system_lib="$withval"
|
ax_boost_user_system_lib="$withval"
|
||||||
fi
|
fi
|
||||||
],
|
],
|
||||||
[want_boost="yes"]
|
[want_boost="yes"]
|
||||||
@@ -70,8 +69,8 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
[AC_LANG_PUSH([C++])
|
[AC_LANG_PUSH([C++])
|
||||||
CXXFLAGS_SAVE=$CXXFLAGS
|
CXXFLAGS_SAVE=$CXXFLAGS
|
||||||
|
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
|
||||||
[[boost::system::system_category]]),
|
[[boost::system::system_category]])],
|
||||||
ax_cv_boost_system=yes, ax_cv_boost_system=no)
|
ax_cv_boost_system=yes, ax_cv_boost_system=no)
|
||||||
CXXFLAGS=$CXXFLAGS_SAVE
|
CXXFLAGS=$CXXFLAGS_SAVE
|
||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
@@ -84,19 +83,19 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
|
|
||||||
LDFLAGS_SAVE=$LDFLAGS
|
LDFLAGS_SAVE=$LDFLAGS
|
||||||
if test "x$ax_boost_user_system_lib" = "x"; then
|
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
|
for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.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}
|
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],
|
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
||||||
[link_system="no"])
|
[link_system="no"])
|
||||||
done
|
done
|
||||||
if test "x$link_system" != "xyes"; then
|
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
|
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}
|
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],
|
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
||||||
[link_system="no"])
|
[link_system="no"])
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
@@ -106,6 +105,9 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
[link_system="no"])
|
[link_system="no"])
|
||||||
done
|
done
|
||||||
|
|
||||||
|
fi
|
||||||
|
if test "x$ax_lib" = "x"; then
|
||||||
|
AC_MSG_ERROR(Could not find a version of the library!)
|
||||||
fi
|
fi
|
||||||
if test "x$link_system" = "xno"; then
|
if test "x$link_system" = "xno"; then
|
||||||
AC_MSG_ERROR(Could not link against $ax_lib !)
|
AC_MSG_ERROR(Could not link against $ax_lib !)
|
||||||
@@ -113,6 +115,6 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
LDFLAGS="$LDFLAGS_SAVED"
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
# http://autoconf-archive.cryp.to/ax_boost_thread.html
|
# http://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
@@ -20,18 +20,17 @@
|
|||||||
#
|
#
|
||||||
# HAVE_BOOST_THREAD
|
# HAVE_BOOST_THREAD
|
||||||
#
|
#
|
||||||
# LAST MODIFICATION
|
# LICENSE
|
||||||
#
|
#
|
||||||
# 2008-04-12
|
# Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
|
||||||
#
|
# Copyright (c) 2009 Michael Tindal
|
||||||
# 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
|
# Copying and distribution of this file, with or without modification, are
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
# and this notice are preserved.
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
|
# warranty.
|
||||||
|
|
||||||
|
#serial 22
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_THREAD],
|
AC_DEFUN([AX_BOOST_THREAD],
|
||||||
[
|
[
|
||||||
@@ -47,7 +46,7 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
ax_boost_user_thread_lib=""
|
ax_boost_user_thread_lib=""
|
||||||
else
|
else
|
||||||
want_boost="yes"
|
want_boost="yes"
|
||||||
ax_boost_user_thread_lib="$withval"
|
ax_boost_user_thread_lib="$withval"
|
||||||
fi
|
fi
|
||||||
],
|
],
|
||||||
[want_boost="yes"]
|
[want_boost="yes"]
|
||||||
@@ -70,15 +69,15 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
CXXFLAGS_SAVE=$CXXFLAGS
|
CXXFLAGS_SAVE=$CXXFLAGS
|
||||||
|
|
||||||
if test "x$build_os" = "xsolaris" ; then
|
if test "x$build_os" = "xsolaris" ; then
|
||||||
CXXFLAGS="-pthreads $CXXFLAGS"
|
CXXFLAGS="-pthreads $CXXFLAGS"
|
||||||
elif test "x$build_os" = "xming32" ; then
|
elif test "x$build_os" = "xming32" ; then
|
||||||
CXXFLAGS="-mthreads $CXXFLAGS"
|
CXXFLAGS="-mthreads $CXXFLAGS"
|
||||||
else
|
else
|
||||||
CXXFLAGS="-pthread $CXXFLAGS"
|
CXXFLAGS="-pthread $CXXFLAGS"
|
||||||
fi
|
fi
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
|
||||||
[[boost::thread_group thrds;
|
[[boost::thread_group thrds;
|
||||||
return 0;]]),
|
return 0;]])],
|
||||||
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
|
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
|
||||||
CXXFLAGS=$CXXFLAGS_SAVE
|
CXXFLAGS=$CXXFLAGS_SAVE
|
||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
@@ -105,19 +104,19 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if test "x$ax_boost_user_thread_lib" = "x"; then
|
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
|
for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a*$;\1;'`; do
|
||||||
ax_lib=${libextension}
|
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],
|
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
|
||||||
[link_thread="no"])
|
[link_thread="no"])
|
||||||
done
|
done
|
||||||
if test "x$link_thread" != "xyes"; then
|
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
|
for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do
|
||||||
ax_lib=${libextension}
|
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],
|
[BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
|
||||||
[link_thread="no"])
|
[link_thread="no"])
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
@@ -127,13 +126,16 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
[link_thread="no"])
|
[link_thread="no"])
|
||||||
done
|
done
|
||||||
|
|
||||||
|
fi
|
||||||
|
if test "x$ax_lib" = "x"; then
|
||||||
|
AC_MSG_ERROR(Could not find a version of the library!)
|
||||||
fi
|
fi
|
||||||
if test "x$link_thread" = "xno"; then
|
if test "x$link_thread" = "xno"; then
|
||||||
AC_MSG_ERROR(Could not link against $ax_lib !)
|
AC_MSG_ERROR(Could not link against $ax_lib !)
|
||||||
else
|
else
|
||||||
case "x$build_os" in
|
case "x$build_os" in
|
||||||
*bsd* )
|
*bsd* )
|
||||||
BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
|
BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
|
||||||
break;
|
break;
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -142,6 +144,6 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_SAVED"
|
CPPFLAGS="$CPPFLAGS_SAVED"
|
||||||
LDFLAGS="$LDFLAGS_SAVED"
|
LDFLAGS="$LDFLAGS_SAVED"
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|||||||
Reference in New Issue
Block a user