X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_cxx_demangle.m4;h=5ae668770b72cf7d8c654fe12fcce2ef4a0ce08a;hb=9835056a5f5240281d13505f1f6fb70085b257b9;hp=13a0db15c50e3db7f5858e41f9684837f7fca265;hpb=604540c15315c6ed876082529f639697ba3eceab;p=m6w6%2Flibmemcached

diff --git a/m4/pandora_cxx_demangle.m4 b/m4/pandora_cxx_demangle.m4
index 13a0db15..5ae66877 100644
--- a/m4/pandora_cxx_demangle.m4
+++ b/m4/pandora_cxx_demangle.m4
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+dnl  Copyright (C) 2009 Sun Microsystems, Inc.
+dnl This file is free software; Sun Microsystems, Inc.
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -9,12 +9,15 @@ dnl are set.
 
 AC_DEFUN([PANDORA_CXX_DEMANGLE],[
   AC_LANG_PUSH([C++])
+  save_CXXFLAGS="${CXXFLAGS}"
+  CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}"
   AC_CHECK_HEADERS(cxxabi.h)
   AC_CACHE_CHECK([checking for abi::__cxa_demangle], pandora_cv_cxa_demangle,
   [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cxxabi.h>]], [[
     char *foo= 0; int bar= 0;
     foo= abi::__cxa_demangle(foo, foo, 0, &bar);
   ]])],[pandora_cv_cxa_demangle=yes],[pandora_cv_cxa_demangle=no])])
+  CXXFLAGS="${save_CXXFLAGS}"
   AC_LANG_POP()
 
   AS_IF([test "x$pandora_cv_cxa_demangle" = xyes],[