X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fhave_cinttypes.m4;h=fbd8c0d22b777f887a6595e0229c3c5abc2fa0cc;hb=78ab72c934e80631b107026ff3bd7cabe305d38d;hp=3ba1316a4b6f3f264dba0c6bc7fa3626ddca7b43;hpb=d7074cbf00c63fad11bae0750f48508fba43aceb;p=awesomized%2Flibmemcached diff --git a/m4/have_cinttypes.m4 b/m4/have_cinttypes.m4 index 3ba1316a..fbd8c0d2 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 2 +#serial 3 AC_DEFUN([AX_CXX_CINTTYPES], [ AC_REQUIRE([AC_PROG_CXX]) @@ -59,18 +59,22 @@ AC_DEFUN([AX_CXX_CINTTYPES], [ [ac_cxx_cinttypes_cinttypes=""]) # Look for tr1/cinttypes - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - uint32_t foo= UINT32_C(1); - ])], - [ac_cxx_cinttypes_tr1_cinttypes=""]) + AS_IF([test -z "$ac_cxx_cinttypes_cinttypes"],[ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([#include ], [ + uint32_t foo= UINT32_C(1); + ])], + [ac_cxx_cinttypes_tr1_cinttypes=""]) # Look for boost/cinttypes.hpp - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - uint32_t foo= UINT32_C(1); - ])], - [ac_cxx_cinttypes_boost_cinttypes_hpp=""]) + AS_IF([test -z "$ac_cxx_cinttypes_tr1_cinttypes"],[ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([#include ], [ + uint32_t foo= UINT32_C(1); + ])], + [ac_cxx_cinttypes_boost_cinttypes_hpp=""]) + ]) + ]) AC_LANG_POP AX_RESTORE_FLAGS