mirror of
https://github.com/vgough/encfs.git
synced 2024-11-24 17:03:13 +01:00
update boost m4 macros
git-svn-id: http://encfs.googlecode.com/svn/branches/1.x@135 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough
parent
b27d4a79e2
commit
16b1cff29b
@ -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 21
|
||||||
|
|
||||||
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,54 @@ 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
|
case $ax_arch in
|
||||||
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
|
x86_64|ppc64|s390x|sparc64|aarch64)
|
||||||
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
|
libsubdirs="lib64 lib lib64"
|
||||||
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
|
;;
|
||||||
break;
|
esac
|
||||||
fi
|
|
||||||
done
|
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
|
||||||
|
dnl or if you install boost with RPM
|
||||||
|
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 +127,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
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
# and this notice are preserved. This file is offered as-is, without any
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
# warranty.
|
# warranty.
|
||||||
|
|
||||||
#serial 22
|
#serial 26
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_FILESYSTEM],
|
AC_DEFUN([AX_BOOST_FILESYSTEM],
|
||||||
[
|
[
|
||||||
@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
|
|||||||
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* $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
|
for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; 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_filesystem" != "xyes"; then
|
if test "x$link_filesystem" != "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 -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; 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],
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
# and this notice are preserved. This file is offered as-is, without any
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
# warranty.
|
# warranty.
|
||||||
|
|
||||||
#serial 18
|
#serial 21
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_SERIALIZATION],
|
AC_DEFUN([AX_BOOST_SERIALIZATION],
|
||||||
[
|
[
|
||||||
@ -80,14 +80,14 @@ AC_DEFUN([AX_BOOST_SERIALIZATION],
|
|||||||
AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
|
AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
|
||||||
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
|
||||||
if test "x$ax_boost_user_serialization_lib" = "x"; then
|
if test "x$ax_boost_user_serialization_lib" = "x"; then
|
||||||
for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.so* $BOOSTLIBDIR/libboost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do
|
for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.so* $BOOSTLIBDIR/libboost_serialization*.dylib* $BOOSTLIBDIR/libboost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do
|
||||||
ax_lib=${libextension}
|
ax_lib=${libextension}
|
||||||
AC_CHECK_LIB($ax_lib, exit,
|
AC_CHECK_LIB($ax_lib, exit,
|
||||||
[BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
|
[BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
|
||||||
[link_serialization="no"])
|
[link_serialization="no"])
|
||||||
done
|
done
|
||||||
if test "x$link_serialization" != "xyes"; then
|
if test "x$link_serialization" != "xyes"; then
|
||||||
for libextension in `ls $BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a*$;\1;'` ; do
|
for libextension in `ls $BOOSTLIBDIR/boost_serialization*.dll* $BOOSTLIBDIR/boost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a.*$;\1;'` ; do
|
||||||
ax_lib=${libextension}
|
ax_lib=${libextension}
|
||||||
AC_CHECK_LIB($ax_lib, exit,
|
AC_CHECK_LIB($ax_lib, exit,
|
||||||
[BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
|
[BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
# and this notice are preserved. This file is offered as-is, without any
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
# warranty.
|
# warranty.
|
||||||
|
|
||||||
#serial 14
|
#serial 17
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_SYSTEM],
|
AC_DEFUN([AX_BOOST_SYSTEM],
|
||||||
[
|
[
|
||||||
@ -83,14 +83,14 @@ 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* $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
|
for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; 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 -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; 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],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user