Ticket #41460: patch-configure.ac.diff
File patch-configure.ac.diff, 1.4 KB (added by ryandesign (Ryan Carsten Schmidt), 11 years ago) |
---|
-
configure.ac
old new 23 23 AC_SUBST([ADDED_CXXFLAGS]) 24 24 25 25 # Extended initializer lists were added in 4.4. 26 # Clang fraudulently identifies itself as an old GCC. 26 27 AC_MSG_CHECKING([if using a version of GCC older than 4.4]) 27 28 AC_PREPROC_IFELSE( 28 29 [AC_LANG_SOURCE([[ 30 #ifndef __clang__ 29 31 #ifdef __GNUC__ 30 32 #if (__GNUC__ * 100 + __GNUC_MINOR__) < 404 31 33 #FAIL 32 34 #endif 33 35 #endif 36 #endif 34 37 ]])], 35 38 [ 36 39 AC_MSG_RESULT(no) … … 107 110 [ 108 111 AC_MSG_RESULT(no) 109 112 AC_MSG_CHECKING([if it helps to add -std=gnu++0x to CXXFLAGS]) 110 CXXFLAGS="-std=gnu++0x ${ CXXFLAGS}"113 CXXFLAGS="-std=gnu++0x ${SAVED_CXXFLAGS}" 111 114 AC_COMPILE_IFELSE( 112 115 [AC_LANG_PROGRAM([[#include <vector>]], 113 116 [[std::vector<int> test = {1}]])], … … 117 120 ], 118 121 [ 119 122 AC_MSG_RESULT(no) 120 AC_DEFINE(NO_INITIALIZER_LISTS) 121 SKIP_COMPLICATED=1 123 # Clang needs -std=c++11 instead 124 AC_MSG_CHECKING([if it helps to add -std=c++11 to CXXFLAGS]) 125 CXXFLAGS="-std=c++11 ${SAVED_CXXFLAGS}" 126 AC_COMPILE_IFELSE( 127 [AC_LANG_PROGRAM([[#include <vector>]], 128 [[std::vector<int> test = {1}]])], 129 [ 130 AC_MSG_RESULT(yes) 131 ADDED_CXXFLAGS="${ADDED_CXXFLAGS} -std=c++11" 132 ], 133 [ 134 AC_MSG_RESULT(no) 135 AC_DEFINE(NO_INITIALIZER_LISTS) 136 SKIP_COMPLICATED=1 137 ] 138 ) 122 139 ] 123 140 ) 124 141 ]