diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 95eeba95b3..4439eb66c5 100644 --- a/configure.in +++ b/configure.in @@ -7,6 +7,7 @@ AC_CONFIG_HEADERS([xbmc/config.h]) AH_TOP([#pragma once]) m4_include([m4/ax_prog_cc_for_build.m4]) m4_include([m4/ax_prog_cxx_for_build.m4]) +m4_include([m4/ax_cxx_compile_stdcxx_11.m4]) m4_include([m4/ax_python_devel.m4]) m4_include([m4/xbmc_arch.m4]) @@ -579,6 +580,7 @@ PASSED_CXXFLAGS=$CXXFLAGS # Hack to override autoconf default values AC_PROG_CXX AX_PROG_CXX_FOR_BUILD CXXFLAGS="$PASSED_CXXFLAGS $DEFAULT_COMPILE_FLAGS" +AX_CXX_COMPILE_STDCXX_11(,[optional]) AC_PROG_LIBTOOL AC_PROG_AWK AC_PROG_LN_S @@ -589,6 +591,20 @@ OBJDUMP="${OBJDUMP:-objdump}" READELF="${READELF:-readelf}" NM="${NM:-nm}" +# Workaround a build issue on i386 with gcc 4.9: +# including <algorithm> pulls in SSE intrinsics. +# possible GCC bug? ideas welcome +if test "$GCC_CXX" = "yes"; then + GCC_VERSION=$($CXX -dumpversion) + GCC_MAJOR_VER=$(echo $GCC_VERSION | awk -F"." '{print $1}') + GCC_MINOR_VER=$(echo $GCC_VERSION | awk -F"." '{print $2}') + + if (test "$GCC_MAJOR_VER" -eq "4" && test "$GCC_MINOR_VER" -ge "9") || (test "$GCC_MAJOR_VER" -gt "4"); then + CXXFLAGS="$CXXFLAGS -msse" + AC_MSG_NOTICE("detected gcc version $GCC_VERSION - enabling SSE") + fi +fi + # host detection and setup case $host in i*86*-linux-android*) @@ -841,15 +857,15 @@ fi use_sse4=no if test "$ARCH" = "x86_64-linux" || test "$ARCH" = "i486-linux"; then - SAVE_CFLAGS="$CFLAGS" - CFLAGS="-msse4.1" - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([int foo;])], - [ use_sse4=yes - USE_SSE4=1], - [ use_sse=no - USE_SSE4=0]) - CFLAGS="$SAVE_CFLAGS" + SAVE_CFLAGS="$CFLAGS" + CFLAGS="-msse4.1" + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([int foo;])], + [ use_sse4=yes + USE_SSE4=1], + [ use_sse4=no + USE_SSE4=0]) + CFLAGS="$SAVE_CFLAGS" fi # Checks for library functions. @@ -928,7 +944,7 @@ AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have # Checks for boost headers using CXX instead of CC AC_LANG_PUSH([C++]) -AC_CHECK_HEADER([boost/shared_ptr.hpp],, AC_MSG_ERROR($missing_library)) +AC_CHECK_HEADER([boost/circular_buffer.hpp],, AC_MSG_ERROR($missing_library)) AC_LANG_POP([C++]) # Python @@ -2852,6 +2868,7 @@ XB_CONFIG_MODULE([lib/gtest], [ CC="$CC" \ CXX="$CXX" \ CFLAGS="$CFLAGS" \ + CXXFLAGS="$CXXFLAGS" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ |