Changeset 4042


Ignore:
Timestamp:
Feb 22, 2021, 12:40:02 AM (3 months ago)
Author:
Peter
Message:

upgrade to autoconf-archive-2021.02.19

Location:
trunk/m4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/ax_boost_base.m4

    r3782 r4042  
    3434#   warranty.
    3535
    36 #serial 45
     36#serial 49
    3737
    3838# example boost program (need to pass version)
     
    114114    AS_CASE([${host_cpu}],
    115115      [x86_64],[libsubdirs="lib64 libx32 lib lib64"],
    116       [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"],
     116      [mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
     117      [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
    117118      [libsubdirs="lib"]
    118119    )
     
    123124    AS_CASE([${host_cpu}],
    124125      [i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
     126      [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
    125127      [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
    126128    )
  • trunk/m4/ax_boost_iostreams.m4

    r3791 r4042  
    3030#   warranty.
    3131
    32 #serial 21
     32#serial 22
    3333
    3434AC_DEFUN([AX_BOOST_IOSTREAMS],
     
    104104            fi
    105105            if test "x$ax_lib" = "x"; then
    106                 AC_MSG_ERROR(Could not find a version of the library!)
     106                AC_MSG_ERROR(Could not find a version of the Boost::IOStreams library!)
    107107            fi
    108108      if test "x$link_iostreams" != "xyes"; then
  • trunk/m4/ax_compiler_vendor.m4

    r3782 r4042  
    99# DESCRIPTION
    1010#
    11 #   Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun,
    12 #   hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft,
    13 #   watcom, etc. The vendor is returned in the cache variable
    14 #   $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++.
     11#   Determine the vendor of the C, C++ or Fortran compiler.  The vendor is
     12#   returned in the cache variable $ax_cv_c_compiler_vendor for C,
     13#   $ax_cv_cxx_compiler_vendor for C++ or $ax_cv_fc_compiler_vendor for
     14#   (modern) Fortran.  The value is one of "intel", "ibm", "pathscale",
     15#   "clang" (LLVM), "cray", "fujitsu", "sdcc", "sx", "portland" (PGI), "gnu"
     16#   (GCC), "sun" (Oracle Developer Studio), "hp", "dec", "borland",
     17#   "comeau", "kai", "lcc", "sgi", "microsoft", "metrowerks", "watcom",
     18#   "tcc" (Tiny CC) or "unknown" (if the compiler cannot be determined).
     19#
     20#   To check for a Fortran compiler, you must first call AC_FC_PP_SRCEXT
     21#   with an appropriate preprocessor-enabled extension.  For example:
     22#
     23#     AC_LANG_PUSH([Fortran])
     24#     AC_PROG_FC
     25#     AC_FC_PP_SRCEXT([F])
     26#     AX_COMPILER_VENDOR
     27#     AC_LANG_POP([Fortran])
    1528#
    1629# LICENSE
     
    1831#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
    1932#   Copyright (c) 2008 Matteo Frigo
     33#   Copyright (c) 2018-19 John Zaitseff <J.Zaitseff@zap.org.au>
    2034#
    2135#   This program is free software: you can redistribute it and/or modify it
     
    4559#   exception to the GPL to apply to your modified version as well.
    4660
    47 #serial 17
     61#serial 30
    4862
    49 AC_DEFUN([AX_COMPILER_VENDOR],
    50 [AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
    51   dnl Please add if possible support to ax_compiler_version.m4
    52   [# note: don't check for gcc first since some other compilers define __GNUC__
    53   vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
    54            ibm:       __xlc__,__xlC__,__IBMC__,__IBMCPP__
    55            pathscale: __PATHCC__,__PATHSCALE__
    56            clang:     __clang__
    57            cray:      _CRAYC
    58            fujitsu:   __FUJITSU
    59            sdcc:      SDCC, __SDCC
    60            gnu:       __GNUC__
    61            sun:       __SUNPRO_C,__SUNPRO_CC
    62            hp:        __HP_cc,__HP_aCC
    63            dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
    64            borland:   __BORLANDC__,__CODEGEARC__,__TURBOC__
    65            comeau:    __COMO__
    66            kai:       __KCC
    67            lcc:       __LCC__
    68            sgi:       __sgi,sgi
    69            microsoft: _MSC_VER
    70            metrowerks: __MWERKS__
    71            watcom:    __WATCOMC__
    72            portland:  __PGI
    73      tcc:       __TINYC__
    74            unknown:   UNKNOWN"
    75   for ventest in $vendors; do
    76     case $ventest in
    77       *:) vendor=$ventest; continue ;;
    78       *)  vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;;
    79     esac
    80     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
    81       #if !($vencpp)
    82         thisisanerror;
    83       #endif
    84     ])], [break])
    85   done
    86   ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1`
    87  ])
    88 ])
     63AC_DEFUN([AX_COMPILER_VENDOR], [dnl
     64    AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, [dnl
     65  dnl  If you modify this list of vendors, please add similar support
     66  dnl  to ax_compiler_version.m4 if at all possible.
     67  dnl
     68  dnl  Note: Do NOT check for GCC first since some other compilers
     69  dnl  define __GNUC__ to remain compatible with it.  Compilers that
     70  dnl  are very slow to start (such as Intel) are listed first.
     71
     72  vendors="
     73    intel:    __ICC,__ECC,__INTEL_COMPILER
     74    ibm:    __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__
     75    pathscale:  __PATHCC__,__PATHSCALE__
     76    clang:    __clang__
     77    cray:   _CRAYC
     78    fujitsu:  __FUJITSU
     79    sdcc:   SDCC,__SDCC
     80    sx:   _SX
     81    portland: __PGI
     82    gnu:    __GNUC__
     83    sun:    __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95
     84    hp:   __HP_cc,__HP_aCC
     85    dec:    __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
     86    borland:  __BORLANDC__,__CODEGEARC__,__TURBOC__
     87    comeau:   __COMO__
     88    kai:    __KCC
     89    lcc:    __LCC__
     90    sgi:    __sgi,sgi
     91    microsoft:  _MSC_VER
     92    metrowerks: __MWERKS__
     93    watcom:   __WATCOMC__
     94    tcc:    __TINYC__
     95    unknown:  UNKNOWN
     96  "
     97  for ventest in $vendors; do
     98      case $ventest in
     99    *:)
     100        vendor=$ventest
     101        continue
     102        ;;
     103    *)
     104        vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")"
     105        ;;
     106      esac
     107
     108      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
     109#if !($vencpp)
     110      thisisanerror;
     111#endif
     112      ]])], [break])
     113  done
     114
     115  ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1`
     116    ])
     117])dnl
  • trunk/m4/ax_cxx_compile_stdcxx.m4

    r3937 r4042  
    1717#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
    1818#   -std=c++11).  If neither is specified, you get whatever works, with
    19 #   preference for an extended mode.
     19#   preference for no added switch, and then for an extended mode.
    2020#
    2121#   The third argument, if specified 'mandatory' or if left unspecified,
     
    3535#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
    3636#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
     37#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
     38#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
    3739#
    3840#   Copying and distribution of this file, with or without modification, are
     
    4143#   warranty.
    4244
    43 #serial 10
     45#serial 12
    4446
    4547dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
     
    6163  AC_LANG_PUSH([C++])dnl
    6264  ac_success=no
     65
     66  m4_if([$2], [], [dnl
     67    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
     68       ax_cv_cxx_compile_cxx$1,
     69      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
     70        [ax_cv_cxx_compile_cxx$1=yes],
     71        [ax_cv_cxx_compile_cxx$1=no])])
     72    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
     73      ac_success=yes
     74    fi])
    6375
    6476  m4_if([$2], [noext], [], [dnl
     
    190202    struct Base
    191203    {
     204      virtual ~Base() {}
    192205      virtual void f() {}
    193206    };
     
    195208    struct Derived : public Base
    196209    {
     210      virtual ~Derived() override {}
    197211      virtual void f() override {}
    198212    };
Note: See TracChangeset for help on using the changeset viewer.