X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fhave_cinttypes.m4;h=192d52ec9804f3e61b18be31be9a3efbde9b4926;hb=8c44ea2a34b6cedf545fd07a568bddad74e9b69e;hp=b28c74ed5545c1247d0aaff239ee1d843a8f1b1e;hpb=dd3626ef6e3fd2a4f7d88a23cd9a91fc2ab5e32d;p=awesomized%2Flibmemcached

diff --git a/m4/have_cinttypes.m4 b/m4/have_cinttypes.m4
index b28c74ed..192d52ec 100644
--- a/m4/have_cinttypes.m4
+++ b/m4/have_cinttypes.m4
@@ -1,11 +1,10 @@
-# vim:ft=m4
 # ===========================================================================
 #     http://tangent.org/
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   AX_CXX_CINTTYPES
+#   AX_CXX_CINTTYPES()
 #
 # DESCRIPTION
 #
@@ -41,47 +40,55 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 1
+#serial 4
 
-
-AC_DEFUN([AX_CXX_CINTTYPES],
-    [
+AC_DEFUN([AX_CXX_CINTTYPES], [
     AC_REQUIRE([AC_PROG_CXX])
     AC_REQUIRE([AC_PROG_CXXCPP])
     AC_REQUIRE([AX_CXX_CSTDINT])
-    AC_MSG_CHECKING(the location of cinttypes)
-    save_CXXFLAGS="${CXXFLAGS}"
-    CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
-    ac_cv_cxx_cinttypes=""
 
-    AC_LANG_PUSH([C++])
-#    AC_CACHE_CHECK([for location of cinttypes], [ac_cv_cxx_cinttypes],
-#      [
-# Look for cinttypes
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <cinttypes>], [ uint32_t foo= UINT32_C(1) ])],
-        [ac_cv_cxx_cinttypes="<cinttypes>"],
-        [
+    AC_CACHE_CHECK([for location of cinttypes], [ac_cv_cxx_cinttypes], [
+      AX_SAVE_FLAGS
+      CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
+      AC_LANG_PUSH([C++])
+
+      AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([#include <cinttypes>], [
+          uint32_t foo= UINT32_C(1); 
+          ])],
+        [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_cv_cxx_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_cv_cxx_cinttypes="<boost/cinttypes.hpp>"])
-          ])
-        ])
-#      ])
-  AC_LANG_POP()
+            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
+      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])
+  ])
 
-  CXXFLAGS="${save_CXXFLAGS}"
-  if test -n "$ac_cv_cxx_cinttypes"; then
-    AC_MSG_RESULT([$ac_cv_cxx_cinttypes])
-  else
-    ac_cv_cxx_cinttypes="<inttypes.h>"
-    AC_MSG_WARN([Could not find a cinttypes header.])
-    AC_MSG_RESULT([$ac_cv_cxx_cinttypes])
-  fi
+  AS_IF([ test -n "$ac_cv_cxx_cinttypes"], [:],[
+      ac_cv_cxx_cinttypes="<inttypes.h>"
+      AC_MSG_WARN([Could not find a cinttypes header.])
+      ])
 
   AC_DEFINE([__STDC_LIMIT_MACROS],[1],[Use STDC Limit Macros in C++])
-  AC_DEFINE_UNQUOTED(CINTTYPES_H,$ac_cv_cxx_cinttypes, [the location of <cinttypes>])
+  AC_DEFINE_UNQUOTED([CINTTYPES_H],[$ac_cv_cxx_cinttypes],[the location of <cinttypes>])
   ])