Changeset 4216


Ignore:
Timestamp:
Sep 6, 2022, 1:21:57 PM (3 months ago)
Author:
Peter
Message:

update to autoconf-archive-2022.09.03

Location:
trunk/m4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/ax_boost_base.m4

    r4099 r4216  
    1212#
    1313#   If no path to the installed boost library is given the macro searchs
    14 #   under /usr, /usr/local, /opt and /opt/local and evaluates the
    15 #   $BOOST_ROOT environment variable. Further documentation is available at
    16 #   <http://randspringer.de/boost/index.html>.
     14#   under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates
     15#   the $BOOST_ROOT environment variable. Further documentation is available
     16#   at <http://randspringer.de/boost/index.html>.
    1717#
    1818#   This macro calls:
     
    3434#   warranty.
    3535
    36 #serial 49
     36#serial 51
    3737
    3838# example boost program (need to pass version)
     
    129129
    130130    dnl first we check the system location for boost libraries
    131     dnl this location ist chosen if boost libraries are installed with the --layout=system option
     131    dnl this location is chosen if boost libraries are installed with the --layout=system option
    132132    dnl or if you install boost with RPM
    133133    AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
     
    152152            search_libsubdirs="$multiarch_libsubdir $libsubdirs"
    153153        fi
    154         for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
     154        for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew ; do
    155155            if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then
    156156                for libsubdir in $search_libsubdirs ; do
     
    228228        else
    229229            if test "x$cross_compiling" != "xyes" ; then
    230                 for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do
     230                for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do
    231231                    if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then
    232232                        for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
  • trunk/m4/ax_cxx_compile_stdcxx.m4

    r4143 r4216  
    4444#   warranty.
    4545
    46 #serial 14
     46#serial 15
    4747
    4848dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
     
    190190#error "This is not a C++ compiler"
    191191
    192 #elif __cplusplus < 201103L
     192// MSVC always sets __cplusplus to 199711L in older versions; newer versions
     193// only set it correctly if /Zc:__cplusplus is specified as well as a
     194// /std:c++NN switch:
     195// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
     196#elif __cplusplus < 201103L && !defined _MSC_VER
    193197
    194198#error "This is not a C++11 compiler"
     
    481485#error "This is not a C++ compiler"
    482486
    483 #elif __cplusplus < 201402L
     487#elif __cplusplus < 201402L && !defined _MSC_VER
    484488
    485489#error "This is not a C++14 compiler"
     
    605609#error "This is not a C++ compiler"
    606610
    607 #elif __cplusplus < 201703L
     611#elif __cplusplus < 201703L && !defined _MSC_VER
    608612
    609613#error "This is not a C++17 compiler"
     
    971975}  // namespace cxx17
    972976
    973 #endif  // __cplusplus < 201703L
     977#endif  // __cplusplus < 201703L && !defined _MSC_VER
    974978
    975979]])
     
    984988#error "This is not a C++ compiler"
    985989
    986 #elif __cplusplus < 202002L
     990#elif __cplusplus < 202002L && !defined _MSC_VER
    987991
    988992#error "This is not a C++20 compiler"
     
    10011005}  // namespace cxx20
    10021006
    1003 #endif  // __cplusplus < 202002L
     1007#endif  // __cplusplus < 202002L && !defined _MSC_VER
    10041008
    10051009]])
Note: See TracChangeset for help on using the changeset viewer.