Merge from build trunk.

[awesomized/libmemcached] / m4 / pandora_cstdint.m4

diff --git a/m4/pandora_cstdint.m4 b/m4/pandora_cstdint.m4
index 619dd326306122de900ff37606e0bf4dfe3b62c6..9c84843823010b6d0e84f614dd2c87f078103849 100644 (file)
--- a/m4/pandora_cstdint.m4
+++ b/m4/pandora_cstdint.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 cstdint. We
 # include AC_TRY_COMPILE for all the combinations we've seen in the
 # wild.  We define one of HAVE_CSTDINT or HAVE_TR1_CSTDINT or 
@@ -7,6 +12,8 @@
 AC_DEFUN([PANDORA_CXX_CSTDINT],
   [AC_MSG_CHECKING(the location of cstdint)
    AC_LANG_PUSH(C++)
+   save_CXXFLAGS="${CXXFLAGS}"
+   CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
    ac_cv_cxx_cstdint=""
    for location in tr1/cstdint boost/cstdint cstdint; do
      if test -z "$ac_cv_cxx_cstdint"; then
@@ -16,6 +23,7 @@ AC_DEFUN([PANDORA_CXX_CSTDINT],
      fi
    done
    AC_LANG_POP()
+   CXXFLAGS="${save_CXXFLAGS}"
    if test -n "$ac_cv_cxx_cstdint"; then
       AC_MSG_RESULT([$ac_cv_cxx_cstdint])
    else