X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fhave_cinttypes.m4;h=192d52ec9804f3e61b18be31be9a3efbde9b4926;hb=bd8a989e9f0d0c115ae771732c9199589e3043fd;hp=6d03cf5d6ceae9126358269be8f4cc8b2d576570;hpb=f3b89b9159152927ca1c547ef30c892bfba05e19;p=awesomized%2Flibmemcached

diff --git a/m4/have_cinttypes.m4 b/m4/have_cinttypes.m4
index 6d03cf5d..192d52ec 100644
--- a/m4/have_cinttypes.m4
+++ b/m4/have_cinttypes.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CXX_CINTTYPES
+#   AX_CXX_CINTTYPES()
 #
 # DESCRIPTION
 #
@@ -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 4
 
 AC_DEFUN([AX_CXX_CINTTYPES], [
     AC_REQUIRE([AC_PROG_CXX])
@@ -48,7 +48,7 @@ AC_DEFUN([AX_CXX_CINTTYPES], [
     AC_REQUIRE([AX_CXX_CSTDINT])
 
     AC_CACHE_CHECK([for location of cinttypes], [ac_cv_cxx_cinttypes], [
-      save_CXXFLAGS="${CXXFLAGS}"
+      AX_SAVE_FLAGS
       CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
       AC_LANG_PUSH([C++])
 
@@ -59,33 +59,34 @@ AC_DEFUN([AX_CXX_CINTTYPES], [
         [ac_cxx_cinttypes_cinttypes="<cinttypes>"])
 
 # Look for tr1/cinttypes
-      AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([#include <tr1/cinttypes>], [
-          uint32_t foo= UINT32_C(1);
-          ])],
-        [ac_cxx_cinttypes_tr1_cinttypes="<tr1/cinttypes>"])
+      AS_IF([test -z "$ac_cxx_cinttypes_cinttypes"],[
+            AC_COMPILE_IFELSE([
+                              AC_LANG_PROGRAM([#include <tr1/cinttypes>], [
+                                              uint32_t foo= UINT32_C(1);
+                                              ])],
+                              [ac_cxx_cinttypes_tr1_cinttypes="<tr1/cinttypes>"])
 
 # Look for boost/cinttypes.hpp
-      AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([#include <boost/cinttypes.hpp>], [
-          uint32_t foo= UINT32_C(1); 
-          ])],
-        [ac_cxx_cinttypes_boost_cinttypes_hpp="<boost/cinttypes.hpp>"])
+            AS_IF([test -z "$ac_cxx_cinttypes_tr1_cinttypes"],[
+                  AC_COMPILE_IFELSE([
+                                    AC_LANG_PROGRAM([#include <boost/cinttypes.hpp>], [
+                                                    uint32_t foo= UINT32_C(1); 
+                                                    ])],
+                                    [ac_cxx_cinttypes_boost_cinttypes_hpp="<boost/cinttypes.hpp>"])
+                  ])
+            ])
 
       AC_LANG_POP
-      CXXFLAGS="${save_CXXFLAGS}"
+      AX_RESTORE_FLAGS
 
       AS_IF([test -n "$ac_cxx_cinttypes_cinttypes"], [ac_cv_cxx_cinttypes=$ac_cxx_cinttypes_cinttypes],
           [test -n "$ac_cxx_cinttypes_tr1_cinttypes"], [ac_cv_cxx_cinttypes=$ac_cxx_cinttypes_tr1_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="<inttypes.h>"
       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++])