From: Michael Wallner Date: Wed, 8 Jan 2020 15:57:47 +0000 (+0100) Subject: m4: fix multiple output X-Git-Tag: pre_cmake~66 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=88b1aa19c0b3c5ad047222618cb17f447ea2bc67;p=m6w6%2Flibmemcached m4: fix multiple output --- diff --git a/m4/have_cinttypes.m4 b/m4/have_cinttypes.m4 index fbd8c0d2..192d52ec 100644 --- a/m4/have_cinttypes.m4 +++ b/m4/have_cinttypes.m4 @@ -40,7 +40,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 3 +#serial 4 AC_DEFUN([AX_CXX_CINTTYPES], [ AC_REQUIRE([AC_PROG_CXX]) @@ -84,12 +84,9 @@ AC_DEFUN([AX_CXX_CINTTYPES], [ [test -n "$ac_cxx_cinttypes_boost_cinttypes_hpp"], [ac_cv_cxx_cinttypes=$ac_cxx_cinttypes_boost_cinttypes_hpp]) ]) - AS_IF([ test -n "$ac_cv_cxx_cinttypes"], [ - AC_MSG_RESULT([$ac_cv_cxx_cinttypes]) - ],[ + AS_IF([ test -n "$ac_cv_cxx_cinttypes"], [:],[ ac_cv_cxx_cinttypes="" AC_MSG_WARN([Could not find a cinttypes header.]) - AC_MSG_RESULT([$ac_cv_cxx_cinttypes]) ]) AC_DEFINE([__STDC_LIMIT_MACROS],[1],[Use STDC Limit Macros in C++]) diff --git a/m4/have_cstdint.m4 b/m4/have_cstdint.m4 index cdd63c72..43e39bd8 100644 --- a/m4/have_cstdint.m4 +++ b/m4/have_cstdint.m4 @@ -40,7 +40,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 3 +#serial 4 AC_DEFUN([AX_CXX_CSTDINT], [ @@ -78,10 +78,9 @@ AC_DEFUN([AX_CXX_CSTDINT], [ [test -n "$ac_cxx_cstdint_boost_cstdint_hpp"], [ac_cv_cxx_cstdint=$ac_cxx_cstdint_boost_cstdint_hpp]) ]) - AS_IF([test -n "$ac_cv_cxx_cstdint"], [AC_MSG_RESULT([$ac_cv_cxx_cstdint])], [ + AS_IF([test -n "$ac_cv_cxx_cstdint"], [:], [ ac_cv_cxx_cstdint="" AC_MSG_WARN([Could not find a cstdint header.]) - AC_MSG_RESULT([$ac_cv_cxx_cstdint]) ]) AC_DEFINE_UNQUOTED([CSTDINT_H],[$ac_cv_cxx_cstdint], [the location of ])