Merge from build trunk.

[awesomized/libmemcached] / m4 / pandora_cinttypes.m4

diff --git a/m4/pandora_cinttypes.m4 b/m4/pandora_cinttypes.m4
index 562fd0d6b54be399317528c014db837f8c263fea..e4a8b478c68d472a7814f7a13dab4de1730c883f 100644 (file)
--- a/m4/pandora_cinttypes.m4
+++ b/m4/pandora_cinttypes.m4
@@ -1,3 +1,8 @@
+# Copyright (C) 2008 Sun Microsystems, Inc.
+# This file is free software; Sun Microsystems, Inc.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # We check two things: where the include file is for cinttypes. We
 # include AC_TRY_COMPILE for all the combinations we've seen in the
 # wild.  We define one of HAVE_CINTTYPES or HAVE_TR1_CINTTYPES or 
@@ -8,6 +13,8 @@ AC_DEFUN([PANDORA_CXX_CINTTYPES],
   [AC_REQUIRE([PANDORA_CXX_CSTDINT])
    AC_MSG_CHECKING(the location of cinttypes)
    AC_LANG_PUSH(C++)
+   save_CXXFLAGS="${CXXFLAGS}"
+   CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
    ac_cv_cxx_cinttypes=""
    for location in tr1/cinttypes boost/cinttypes cinttypes; do
      if test -z "$ac_cv_cxx_cinttypes"; then
@@ -18,14 +25,15 @@ AC_DEFUN([PANDORA_CXX_CINTTYPES],
      fi
    done
    AC_LANG_POP()
+   CXXFLAGS="${save_CXXFLAGS}"
    if test -n "$ac_cv_cxx_cinttypes"; then
       AC_MSG_RESULT([$ac_cv_cxx_cinttypes])
    else
-      AC_DEFINE([__STDC_LIMIT_MACROS],[1],[Use STDC Limit Macros in C++])
       ac_cv_cxx_cinttypes="<inttypes.h>"
       AC_MSG_RESULT()
       AC_MSG_WARN([Could not find a cinttypes header.])
    fi
+   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>])
 ])