Commit f7abab6b authored by Cristy's avatar Cristy

Update M4 macros

parent 1da4e1e1
...@@ -23,33 +23,12 @@ ...@@ -23,33 +23,12 @@
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> # Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> # Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
# #
# This program is free software: you can redistribute it and/or modify it # Copying and distribution of this file, with or without modification, are
# under the terms of the GNU General Public License as published by the # permitted in any medium without royalty provided the copyright notice
# Free Software Foundation, either version 3 of the License, or (at your # and this notice are preserved. This file is offered as-is, without any
# option) any later version. # warranty.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <https://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
#serial 7 #serial 8
AC_DEFUN([AX_APPEND_FLAG], AC_DEFUN([AX_APPEND_FLAG],
[dnl [dnl
......
...@@ -29,33 +29,12 @@ ...@@ -29,33 +29,12 @@
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> # Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> # Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
# #
# This program is free software: you can redistribute it and/or modify it # Copying and distribution of this file, with or without modification, are
# under the terms of the GNU General Public License as published by the # permitted in any medium without royalty provided the copyright notice
# Free Software Foundation, either version 3 of the License, or (at your # and this notice are preserved. This file is offered as-is, without any
# option) any later version. # warranty.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <https://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
#serial 5 #serial 6
AC_DEFUN([AX_CHECK_COMPILE_FLAG], AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 16 #serial 17
AC_DEFUN([AX_COMPILER_VENDOR], AC_DEFUN([AX_COMPILER_VENDOR],
[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, [AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
...@@ -56,6 +56,7 @@ AC_DEFUN([AX_COMPILER_VENDOR], ...@@ -56,6 +56,7 @@ AC_DEFUN([AX_COMPILER_VENDOR],
clang: __clang__ clang: __clang__
cray: _CRAYC cray: _CRAYC
fujitsu: __FUJITSU fujitsu: __FUJITSU
sdcc: SDCC, __SDCC
gnu: __GNUC__ gnu: __GNUC__
sun: __SUNPRO_C,__SUNPRO_CC sun: __SUNPRO_C,__SUNPRO_CC
hp: __HP_cc,__HP_aCC hp: __HP_cc,__HP_aCC
......
...@@ -20,18 +20,17 @@ ...@@ -20,18 +20,17 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 7 #serial 8
AU_ALIAS([AC_CXX_NAMESPACE_STD], [AX_CXX_NAMESPACE_STD]) AU_ALIAS([AC_CXX_NAMESPACE_STD], [AX_CXX_NAMESPACE_STD])
AC_DEFUN([AX_CXX_NAMESPACE_STD], [ AC_DEFUN([AX_CXX_NAMESPACE_STD], [
AC_CACHE_CHECK(if g++ supports namespace std, AC_CACHE_CHECK(if g++ supports namespace std,
ax_cv_cxx_have_std_namespace, ax_cv_cxx_have_std_namespace,
[AC_LANG_SAVE [AC_LANG_PUSH([C++])
AC_LANG_CPLUSPLUS AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iostream>
AC_TRY_COMPILE([#include <iostream> std::istream& is = std::cin;]], [])],
std::istream& is = std::cin;],, [ax_cv_cxx_have_std_namespace=yes], [ax_cv_cxx_have_std_namespace=no])
ax_cv_cxx_have_std_namespace=yes, ax_cv_cxx_have_std_namespace=no) AC_LANG_POP([C++])
AC_LANG_RESTORE
]) ])
if test "$ax_cv_cxx_have_std_namespace" = yes; then if test "$ax_cv_cxx_have_std_namespace" = yes; then
AC_DEFINE(HAVE_NAMESPACE_STD,,[Define if g++ supports namespace std. ]) AC_DEFINE(HAVE_NAMESPACE_STD,,[Define if g++ supports namespace std. ])
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> # Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
# Copyright (c) 2008 Matteo Frigo # Copyright (c) 2008 Matteo Frigo
# Copyright (c) 2014 Tsukasa Oi # Copyright (c) 2014 Tsukasa Oi
# Copyright (c) 2017 Alexey Kopytov # Copyright (c) 2017-2018 Alexey Kopytov
# #
# This program is free software: you can redistribute it and/or modify it # This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the # under the terms of the GNU General Public License as published by the
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 20 #serial 22
AC_DEFUN([AX_GCC_ARCHFLAG], AC_DEFUN([AX_GCC_ARCHFLAG],
[AC_REQUIRE([AC_PROG_CC]) [AC_REQUIRE([AC_PROG_CC])
...@@ -108,7 +108,7 @@ case $host_cpu in ...@@ -108,7 +108,7 @@ case $host_cpu in
*2?6[[ad]]?:*:*:*) ax_gcc_arch="sandybridge corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; *2?6[[ad]]?:*:*:*) ax_gcc_arch="sandybridge corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;;
*3?6[[ae]]?:*:*:*) ax_gcc_arch="ivybridge core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; *3?6[[ae]]?:*:*:*) ax_gcc_arch="ivybridge core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;;
*3?6[[cf]]?:*:*:*|*4?6[[56]]?:*:*:*) ax_gcc_arch="haswell core-avx2 core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; *3?6[[cf]]?:*:*:*|*4?6[[56]]?:*:*:*) ax_gcc_arch="haswell core-avx2 core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;;
*3?6d?:*:*:*) ax_gcc_arch="broadwell core-avx2 core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; *3?6d?:*:*:*|*4?6[[7f]]?:*:*:*|*5?66?:*:*:*) ax_gcc_arch="broadwell core-avx2 core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;;
*1?6c?:*:*:*|*2?6[[67]]?:*:*:*|*3?6[[56]]?:*:*:*) ax_gcc_arch="bonnell atom core2 pentium-m pentium3 pentiumpro" ;; *1?6c?:*:*:*|*2?6[[67]]?:*:*:*|*3?6[[56]]?:*:*:*) ax_gcc_arch="bonnell atom core2 pentium-m pentium3 pentiumpro" ;;
*3?67?:*:*:*|*[[45]]?6[[ad]]?:*:*:*) ax_gcc_arch="silvermont atom core2 pentium-m pentium3 pentiumpro" ;; *3?67?:*:*:*|*[[45]]?6[[ad]]?:*:*:*) ax_gcc_arch="silvermont atom core2 pentium-m pentium3 pentiumpro" ;;
*000?f[[012]]?:*:*:*|?f[[012]]?:*:*:*|f[[012]]?:*:*:*) ax_gcc_arch="pentium4 pentiumpro" ;; *000?f[[012]]?:*:*:*|?f[[012]]?:*:*:*|f[[012]]?:*:*:*) ax_gcc_arch="pentium4 pentiumpro" ;;
...@@ -198,6 +198,10 @@ case $host_cpu in ...@@ -198,6 +198,10 @@ case $host_cpu in
*POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";; *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";;
*POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";; *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";;
603ev|8240) ax_gcc_arch="$cputype 603e 603";; 603ev|8240) ax_gcc_arch="$cputype 603e 603";;
*POWER7*) ax_gcc_arch="power7";;
*POWER8*) ax_gcc_arch="power8";;
*POWER9*) ax_gcc_arch="power9";;
*POWER10*) ax_gcc_arch="power10";;
*) ax_gcc_arch=$cputype ;; *) ax_gcc_arch=$cputype ;;
esac esac
ax_gcc_arch="$ax_gcc_arch powerpc" ax_gcc_arch="$ax_gcc_arch powerpc"
......
...@@ -2,6 +2,15 @@ ...@@ -2,6 +2,15 @@
# http://www.gnu.org/software/autoconf-archive/ax_lang_compiler_ms.html # http://www.gnu.org/software/autoconf-archive/ax_lang_compiler_ms.html
# =========================================================================== # ===========================================================================
# #
# OBSOLETE MACRO
#
# Deprecated in favor of AX_COMPILER_VENDOR. A call to this macro can be
# replaced by:
#
# AX_COMPILER_VENDOR
# AS_IF([test $ax_cv_c_compiler_vendor = microsoft],
# [ax_compiler_ms=yes],[ax_compiler_ms=no])
#
# SYNOPSIS # SYNOPSIS
# #
# AX_LANG_COMPILER_MS # AX_LANG_COMPILER_MS
...@@ -22,7 +31,7 @@ ...@@ -22,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 8 #serial 11
AC_DEFUN([AX_LANG_COMPILER_MS], AC_DEFUN([AX_LANG_COMPILER_MS],
[AC_CACHE_CHECK([whether we are using the Microsoft _AC_LANG compiler], [AC_CACHE_CHECK([whether we are using the Microsoft _AC_LANG compiler],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment