12345678910111213141516171819202122232425262728293031323334 |
- diff -up webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4
- --- webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4.gcc5 2015-01-07 10:45:43.000000000 +0100
- +++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-02-18 13:09:57.359888184 +0100
- @@ -87,12 +87,12 @@ AC_SYS_LARGEFILE
- c_compiler="unknown"
- AC_LANG_PUSH([C])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- -#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
- +#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
- #error Not a supported GCC compiler
- #endif
- ])], [c_compiler="gcc"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
- +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang compiler
- #endif
- ])], [c_compiler="clang"], [])
- @@ -106,12 +106,12 @@ fi
- cxx_compiler="unknown"
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- -#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
- +#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
- #error Not a supported G++ compiler
- #endif
- ])], [cxx_compiler="g++"], [])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
- +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
- #error Not a supported Clang++ compiler
- #endif
- ])], [cxx_compiler="clang++"], [])
|