diff options
| author | David Reiss <dreiss@apache.org> | 2008-03-26 07:22:26 +0000 |
|---|---|---|
| committer | David Reiss <dreiss@apache.org> | 2008-03-26 07:22:26 +0000 |
| commit | 2d2aa145b4b9595fb128009536528ce533df1be1 (patch) | |
| tree | eb4e842057c793522b6f24567bf783f26a4ad7e7 /aclocal | |
| parent | 0c703cc2f8dd85016a2d7f19b31b09aee42361e0 (diff) | |
| download | thrift-2d2aa145b4b9595fb128009536528ce533df1be1.tar.gz | |
Update to the latest version of AX_BOOST_BASE.
It now has the license right in the file.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665583 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/ax_boost_base.m4 | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4 index f225bff44..e56bb7380 100644 --- a/aclocal/ax_boost_base.m4 +++ b/aclocal/ax_boost_base.m4 @@ -1,30 +1,42 @@ -dnl @synopsis AX_BOOST([MINIMUM-VERSION]) -dnl -dnl Test for the Boost C++ libraries of a particular version (or newer) -dnl -dnl If no path to the installed boost library is given the macro -dnl searchs under /usr, /usr/local, and /opt, and evaluates the -dnl $BOOST_ROOT environment variable. Further documentation is -dnl available at <http://randspringer.de/boost/index.html>. -dnl -dnl This macro calls: -dnl -dnl AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) -dnl -dnl And sets: -dnl -dnl HAVE_BOOST -dnl -dnl @category InstalledPackages -dnl @category Cxx -dnl @author Thomas Porschberg <thomas@randspringer.de> -dnl @version 2006-06-15 -dnl @license AllPermissive +##### http://autoconf-archive.cryp.to/ax_boost_base.html +# +# SYNOPSIS +# +# AX_BOOST_BASE([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# Test for the Boost C++ libraries of a particular version (or newer) +# +# If no path to the installed boost library is given the macro +# searchs under /usr, /usr/local, /opt and /opt/local and evaluates +# the $BOOST_ROOT environment variable. Further documentation is +# available at <http://randspringer.de/boost/index.html>. +# +# This macro calls: +# +# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) +# +# And sets: +# +# HAVE_BOOST +# +# LAST MODIFICATION +# +# 2007-07-28 +# +# COPYLEFT +# +# Copyright (c) 2007 Thomas Porschberg <thomas@randspringer.de> +# +# 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_BASE], [ AC_ARG_WITH([boost], - AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify an alternate root directory for boost]), + AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]), [ if test "$withval" = "no"; then want_boost="no" @@ -32,7 +44,7 @@ AC_ARG_WITH([boost], want_boost="yes" ac_boost_path="" else - want_boost="yes" + want_boost="yes" ac_boost_path="$withval" fi ], @@ -58,7 +70,7 @@ if test "x$want_boost" = "xyes"; then BOOST_LDFLAGS="-L$ac_boost_path/lib" BOOST_CPPFLAGS="-I$ac_boost_path/include" else - for ac_boost_path_tmp in /usr /usr/local /opt ; do + 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 BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" @@ -112,7 +124,7 @@ if test "x$want_boost" = "xyes"; then done fi else - for ac_boost_path in /usr /usr/local /opt ; do + for ac_boost_path in /usr /usr/local /opt /opt/local ; do 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 _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` |