merged m4 script update from RC_0_16

This commit is contained in:
Arvid Norberg 2014-01-24 18:20:05 +00:00
parent 34b83ddd71
commit b3ea887109
1 changed files with 190 additions and 147 deletions

View File

@ -1,10 +1,10 @@
# =========================================================================== # ===========================================================================
# http://www.nongnu.org/autoconf-archive/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,40 +23,45 @@
# #
# HAVE_BOOST # HAVE_BOOST
# #
# EDIT: 2009-09-07 Cristian Greco <cristian.debian@gmail.com>
# - Call AC_SUBST(BOOST_VERSION).
#
# LICENSE # LICENSE
# #
# 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 22
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),
if test "x$withval" = "xno"; then from the specified location (ARG=<path>),
want_boost="no" or disable it (ARG=no)
elif test "x$withval" = "xyes"; then @<:@ARG=yes@:>@ ])],
[
if test "$withval" = "no"; then
want_boost="no"
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
@ -67,158 +72,196 @@ 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 "x$ac_boost_path" != "x"; 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" ;;
BOOST_VERSION=`grep "define BOOST_LIB_VERSION" $ac_boost_path_tmp/include/boost/version.hpp | sed 's,^.*\"\([[0-9]][[_0-9]]*\)\"$,\1, ; s,_0$,, ; s,_,.,'` esac
break;
fi dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
done dnl them priority over the other paths since, if libs are found there, they
fi dnl are almost assuredly the ones desired.
AC_REQUIRE([AC_CANONICAL_HOST])
libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
dnl first we check the system location for boost libraries
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
if test "x$ac_boost_lib_path" != "x"; then if test "$ac_boost_lib_path" != ""; 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 "x$ac_boost_path" != "x"; 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 "x$ac_boost_lib_path" = "x" 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 : '.*/\(.*\)'`
if test "$V_CHECK" = "1" -a "x$ac_boost_lib_path" = "x" ; then stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
BOOST_CPPFLAGS="-I$BOOST_ROOT" V_CHECK=`expr $stage_version_shorten \>\= $_version`
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
fi AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
fi BOOST_CPPFLAGS="-I$BOOST_ROOT"
fi BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
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 "x$succeeded" != "xyes" ; 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_SUBST(BOOST_VERSION) AC_SUBST(BOOST_CPPFLAGS)
AC_DEFINE(HAVE_BOOST,[1],[define if the Boost library is available]) AC_SUBST(BOOST_LDFLAGS)
fi 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
]) ])