X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fhave_cstdint.m4;h=43e39bd8559d5b05d6183d09ff2fd0d69a601851;hb=50532bea9eb770554e1e962d03b868987303acbe;hp=685d4ade4b775e7caf8bf31be9ad36b6314c33f7;hpb=f3b89b9159152927ca1c547ef30c892bfba05e19;p=awesomized%2Flibmemcached

diff --git a/m4/have_cstdint.m4 b/m4/have_cstdint.m4
index 685d4ade..43e39bd8 100644
--- a/m4/have_cstdint.m4
+++ b/m4/have_cstdint.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_CXX_CSTDINT
+#   AX_CXX_CSTDINT()
 #
 # 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_CSTDINT], [
@@ -49,35 +49,38 @@ AC_DEFUN([AX_CXX_CSTDINT], [
 
     AC_CACHE_CHECK([for location of cstdint], [ac_cv_cxx_cstdint], [
       AC_LANG_PUSH([C++])
-      save_CXXFLAGS="${CXXFLAGS}"
+      AX_SAVE_FLAGS
       CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
 
       AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([#include <cstdint>], [ uint32_t t ])],
+        AC_LANG_PROGRAM([#include <cstdint>], [
+        uint32_t t 
+        ])],
         [ac_cxx_cstdint_cstdint="<cstdint>"])
 
-      AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([#include <tr1/cstdint>], [ uint32_t t ])],
-        [ac_cxx_cstdint_tr1_cstdint="<tr1/cstdint>"])
+      AS_IF([test -z "$ac_cxx_cstdint_cstdint"],[
+            AC_COMPILE_IFELSE([
+                              AC_LANG_PROGRAM([#include <tr1/cstdint>], [ uint32_t t ])],
+                              [ac_cxx_cstdint_tr1_cstdint="<tr1/cstdint>"])
 
-      AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([#include <boost/cstdint.hpp>], [ uint32_t t ])],
-        [ac_cxx_cstdint_boost_cstdint_hpp="<boost/cstdint.hpp>"])
+            AS_IF([test -z "$ac_cxx_cstdint_tr1_cstdint"],[
+                  AC_COMPILE_IFELSE([
+                                    AC_LANG_PROGRAM([#include <boost/cstdint.hpp>], [ uint32_t t ])],
+                                    [ac_cxx_cstdint_boost_cstdint_hpp="<boost/cstdint.hpp>"])
+                  ])
+            ])
 
       AC_LANG_POP
-      CXXFLAGS="${save_CXXFLAGS}"
+      AX_RESTORE_FLAGS
 
       AS_IF([test -n "$ac_cxx_cstdint_cstdint"], [ac_cv_cxx_cstdint=$ac_cxx_cstdint_cstdint],
         [test -n "$ac_cxx_cstdint_tr1_cstdint"], [ac_cv_cxx_cstdint=$ac_cxx_cstdint_tr1_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="<stdint.h>"
       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 <cstdint>])