Enabled -std=c++11 option if compiler supported

jubatus · Mar 18, 2016 · 076da8d · 076da8d
1 parent f237b05
commit 076da8d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/configure.in b/configure.in
@@ -110,8 +110,19 @@ else
 fi
 AC_MSG_RESULT($enable_debug)
 
+AC_CONFIG_FILES([jubatus/mp/config.h])
+AC_LANG(C++)
+mp_cxxflags_backup="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -std=c++11 -Wno-deprecated-declarations"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+  mp_use_cpp11_standard="#define MP_FUNCTIONAL_STANDARD
+#define MP_MEMORY_STANDARD
+#define MP_UNORDERED_MAP_STANDARD"
+  AC_SUBST([mp_use_cpp11_standard]),
+  CXXFLAGS="$mp_cxxflags_backup"
+)
+
 AC_OUTPUT([Makefile
 		   jubatus/mp/Makefile
 		   mpsrc/Makefile
 		   test/Makefile])
-
diff --git a/jubatus/mp/Makefile.am b/jubatus/mp/Makefile.am
@@ -3,6 +3,7 @@
 libjubatus_mpio_includedir = $(includedir)/jubatus/mp
 
 libjubatus_mpio_include_HEADERS = \
+		config.h \
 		endian.h \
 		exception.h \
 		functional.h \

diff --git a/jubatus/mp/config.h.in b/jubatus/mp/config.h.in
@@ -0,0 +1,6 @@
+#ifndef MP_CONFIG_H__
+#define MP_CONFIG_H__
+
+@mp_use_cpp11_standard@
+
+#endif
diff --git a/jubatus/mp/functional.h b/jubatus/mp/functional.h
@@ -18,6 +18,8 @@
 #ifndef MP_FUNCTIONAL_H__
 #define MP_FUNCTIONAL_H__
 
+#include "jubatus/mp/config.h"
+
 #ifdef MP_FUNCTIONAL_BOOST
 #include <boost/tr1/functional.hpp>
 namespace mp {

diff --git a/jubatus/mp/memory.h b/jubatus/mp/memory.h
@@ -18,6 +18,8 @@
 #ifndef MP_MEMORY_H__
 #define MP_MEMORY_H__
 
+#include "jubatus/mp/config.h"
+
 #ifdef MP_MEMORY_BOOST
 #include <boost/tr1/memory>
 namespace mp {

diff --git a/jubatus/mp/unordered.h b/jubatus/mp/unordered.h
@@ -19,6 +19,8 @@
 #ifndef MP_UNORDERED_H__
 #define MP_UNORDERED_H__
 
+#include "jubatus/mp/config.h"
+
 #if   defined(MP_UNORDERED_MAP_BOOST)
 #include <boost/tr1/unordered_map.hpp>
 #include <boost/tr1/unordered_set.hpp>