diff options
| author | fanquake <fanquake@gmail.com> | 2022-08-31 10:51:50 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-08-31 10:51:50 +0100 |
| commit | 14148d727154d99e23fd71bffa0e69024ab90c11 (patch) | |
| tree | 7d5eca1076f377186f3ed897a533d62e2ddd180c | |
| parent | be0ec77bbc7d68041e8abe6a47a915de138608e8 (diff) | |
| download | autoconf-archive-14148d727154d99e23fd71bffa0e69024ab90c11.tar.gz | |
boost_base: add /opt/homebrew to search paths
Users with Boost installed via homebrew on arm64 (M1) hardware will
have the libs under this path. Not sure if this is something you'd want
to accomodate, but we currently patch this into the macro, so have
decided to upstream.
| -rw-r--r-- | m4/ax_boost_base.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 index 487a02a..6c944b1 100644 --- a/m4/ax_boost_base.m4 +++ b/m4/ax_boost_base.m4 @@ -11,9 +11,9 @@ # 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>. +# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates +# the $BOOST_ROOT environment variable. Further documentation is available +# at <http://randspringer.de/boost/index.html>. # # This macro calls: # @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 50 +#serial 51 # example boost program (need to pass version) m4_define([_AX_BOOST_BASE_PROGRAM], @@ -151,7 +151,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ else search_libsubdirs="$multiarch_libsubdir $libsubdirs" fi - for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew ; do if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then for libsubdir in $search_libsubdirs ; do if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi @@ -227,7 +227,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ fi else if test "x$cross_compiling" != "xyes" ; then - for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do + for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` |