Changeset 4042

Timestamp:

Feb 22, 2021, 12:40:02 AM (3 years ago)

Author:

Peter

Message:

upgrade to autoconf-archive-2021.02.19

Location:

trunk/m4

Files:

• ax_boost_base.m4 (modified) (3 diffs)
• ax_boost_iostreams.m4 (modified) (2 diffs)
• ax_compiler_vendor.m4 (modified) (3 diffs)
• ax_cxx_compile_stdcxx.m4 (modified) (6 diffs)

trunk/m4/ax_boost_base.m4

@@ -34 +34 @@
 #   warranty.
 
-#serial 45
+#serial 49
 
 # example boost program (need to pass version)
@@ -114 +114 @@
     AS_CASE([${host_cpu}],
       [x86_64],[libsubdirs="lib64 libx32 lib lib64"],
-      [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"],
+      [mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
+      [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
       [libsubdirs="lib"]
     )
@@ -123 +124 @@
     AS_CASE([${host_cpu}],
       [i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
+      [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
       [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
     )

trunk/m4/ax_boost_iostreams.m4

@@ -30 +30 @@
 #   warranty.
 
-#serial 21
+#serial 22
 
 AC_DEFUN([AX_BOOST_IOSTREAMS],
@@ -104 +104 @@
             fi
             if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
+                AC_MSG_ERROR(Could not find a version of the Boost::IOStreams library!)
             fi
       if test "x$link_iostreams" != "xyes"; then

trunk/m4/ax_compiler_vendor.m4

@@ -9 +9 @@
 # DESCRIPTION
 #
-#   Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun,
-#   hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft,
-#   watcom, etc. The vendor is returned in the cache variable
-#   $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++.
+#   Determine the vendor of the C, C++ or Fortran compiler.  The vendor is
+#   returned in the cache variable $ax_cv_c_compiler_vendor for C,
+#   $ax_cv_cxx_compiler_vendor for C++ or $ax_cv_fc_compiler_vendor for
+#   (modern) Fortran.  The value is one of "intel", "ibm", "pathscale",
+#   "clang" (LLVM), "cray", "fujitsu", "sdcc", "sx", "portland" (PGI), "gnu"
+#   (GCC), "sun" (Oracle Developer Studio), "hp", "dec", "borland",
+#   "comeau", "kai", "lcc", "sgi", "microsoft", "metrowerks", "watcom",
+#   "tcc" (Tiny CC) or "unknown" (if the compiler cannot be determined).
+#
+#   To check for a Fortran compiler, you must first call AC_FC_PP_SRCEXT
+#   with an appropriate preprocessor-enabled extension.  For example:
+#
+#     AC_LANG_PUSH([Fortran])
+#     AC_PROG_FC
+#     AC_FC_PP_SRCEXT([F])
+#     AX_COMPILER_VENDOR
+#     AC_LANG_POP([Fortran])
 #
 # LICENSE
@@ -18 +31 @@
 #   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 #   Copyright (c) 2008 Matteo Frigo
+#   Copyright (c) 2018-19 John Zaitseff <J.Zaitseff@zap.org.au>
 #
 #   This program is free software: you can redistribute it and/or modify it
@@ -45 +59 @@
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 17
+#serial 30
 
-AC_DEFUN([AX_COMPILER_VENDOR],
-[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
-  dnl Please add if possible support to ax_compiler_version.m4
-  [# note: don't check for gcc first since some other compilers define __GNUC__
-  vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
-           ibm:       __xlc__,__xlC__,__IBMC__,__IBMCPP__
-           pathscale: __PATHCC__,__PATHSCALE__
-           clang:     __clang__
-           cray:      _CRAYC
-           fujitsu:   __FUJITSU
-           sdcc:      SDCC, __SDCC
-           gnu:       __GNUC__
-           sun:       __SUNPRO_C,__SUNPRO_CC
-           hp:        __HP_cc,__HP_aCC
-           dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
-           borland:   __BORLANDC__,__CODEGEARC__,__TURBOC__
-           comeau:    __COMO__
-           kai:       __KCC
-           lcc:       __LCC__
-           sgi:       __sgi,sgi
-           microsoft: _MSC_VER
-           metrowerks: __MWERKS__
-           watcom:    __WATCOMC__
-           portland:  __PGI
-     tcc:       __TINYC__
-           unknown:   UNKNOWN"
-  for ventest in $vendors; do
-    case $ventest in
-      *:) vendor=$ventest; continue ;;
-      *)  vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;;
-    esac
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-      #if !($vencpp)
-        thisisanerror;
-      #endif
-    ])], [break])
-  done
-  ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1`
- ])
-])
+AC_DEFUN([AX_COMPILER_VENDOR], [dnl
+    AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, [dnl
+  dnl  If you modify this list of vendors, please add similar support
+  dnl  to ax_compiler_version.m4 if at all possible.
+  dnl
+  dnl  Note: Do NOT check for GCC first since some other compilers
+  dnl  define __GNUC__ to remain compatible with it.  Compilers that
+  dnl  are very slow to start (such as Intel) are listed first.
+
+  vendors="
+    intel:    __ICC,__ECC,__INTEL_COMPILER
+    ibm:    __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__
+    pathscale:  __PATHCC__,__PATHSCALE__
+    clang:    __clang__
+    cray:   _CRAYC
+    fujitsu:  __FUJITSU
+    sdcc:   SDCC,__SDCC
+    sx:   _SX
+    portland: __PGI
+    gnu:    __GNUC__
+    sun:    __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95
+    hp:   __HP_cc,__HP_aCC
+    dec:    __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
+    borland:  __BORLANDC__,__CODEGEARC__,__TURBOC__
+    comeau:   __COMO__
+    kai:    __KCC
+    lcc:    __LCC__
+    sgi:    __sgi,sgi
+    microsoft:  _MSC_VER
+    metrowerks: __MWERKS__
+    watcom:   __WATCOMC__
+    tcc:    __TINYC__
+    unknown:  UNKNOWN
+  "
+  for ventest in $vendors; do
+      case $ventest in
+    *:)
+        vendor=$ventest
+        continue
+        ;;
+    *)
+        vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")"
+        ;;
+      esac
+
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
+#if !($vencpp)
+      thisisanerror;
+#endif
+      ]])], [break])
+  done
+
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1`
+    ])
+])dnl

trunk/m4/ax_cxx_compile_stdcxx.m4

@@ -17 +17 @@
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
 #   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
+#   preference for no added switch, and then for an extended mode.
 #
 #   The third argument, if specified 'mandatory' or if left unspecified,
@@ -35 +35 @@
 #   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
 #   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
+#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
+#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
 #
 #   Copying and distribution of this file, with or without modification, are
@@ -41 +43 @@
 #   warranty.
 
-#serial 10
+#serial 12
 
 dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
@@ -61 +63 @@
   AC_LANG_PUSH([C++])dnl
   ac_success=no
+
+  m4_if([$2], [], [dnl
+    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+       ax_cv_cxx_compile_cxx$1,
+      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+        [ax_cv_cxx_compile_cxx$1=yes],
+        [ax_cv_cxx_compile_cxx$1=no])])
+    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+      ac_success=yes
+    fi])
 
   m4_if([$2], [noext], [], [dnl
@@ -190 +202 @@
     struct Base
     {
+      virtual ~Base() {}
       virtual void f() {}
     };
@@ -195 +208 @@
     struct Derived : public Base
     {
+      virtual ~Derived() override {}
       virtual void f() override {}
     };