X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_check_cxx_standard.m4;h=6a88a31f3298cd72c534603aa8563944ae8bab3d;hb=7c986323bd4eece0d805f4df17eb03ea094f84f6;hp=d4189ea0b5ec41abd893e48d1676938712f554cf;hpb=d6524995788ff698a0275284f3df4adfec8b6c67;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_check_cxx_standard.m4 b/m4/pandora_check_cxx_standard.m4
index d4189ea0..6a88a31f 100644
--- a/m4/pandora_check_cxx_standard.m4
+++ b/m4/pandora_check_cxx_standard.m4
@@ -8,9 +8,16 @@ AC_DEFUN([PANDORA_CHECK_CXX_STANDARD],[
   AS_IF([test "$GCC" = "yes"],
         [AS_IF([test "$ac_cv_cxx_compile_cxx0x_native" = "yes"],[],
                [AS_IF([test "$ac_cv_cxx_compile_cxx0x_gxx" = "yes"],
-                      [CXXFLAGS="-std=gnu++0x ${CXXFLAGS}"],
-                      [CXXFLAGS="-std=gnu++98"])
+                      [CXX_STANDARD="-std=gnu++0x"],
+                      [CXX_STANDARD="-std=gnu++98"])
                ])
         ])
+  AM_CXXFLAGS="${CXX_STANDARD} ${AM_CXXFLAGS}"
+  
+  save_CXXFLAGS="${CXXFLAGS}"
+  CXXFLAGS="${CXXFLAGS} ${CXX_STANDARD}"
   AC_CXX_HEADER_STDCXX_98
+  CXXFLAGS="${save_CXXFLAGS}"
+
+  AC_SUBST([CXX_STANDARD])
 ])