1.1 --- a/common/autoconf/generated-configure.sh Wed Sep 12 17:28:01 2018 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Wed Sep 12 16:13:34 2018 +0100
1.3 @@ -4336,7 +4336,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1536078152
1.8 +DATE_WHEN_GENERATED=1536764960
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -29879,25 +29879,25 @@
1.13
1.14
1.15
1.16 - if test "x$CC_VERSION" != "x$CXX_VERSION"; then
1.17 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C and C++ compiler has different version numbers, $CC_VERSION vs $CXX_VERSION." >&5
1.18 -$as_echo "$as_me: WARNING: C and C++ compiler has different version numbers, $CC_VERSION vs $CXX_VERSION." >&2;}
1.19 + if test "x$CC_VERSION_NUMBER" != "x$CXX_VERSION_NUMBER"; then
1.20 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C and C++ compiler has different version numbers, $CC_VERSION_NUMBER vs $CXX_VERSION_NUMBER." >&5
1.21 +$as_echo "$as_me: WARNING: C and C++ compiler has different version numbers, $CC_VERSION_NUMBER vs $CXX_VERSION_NUMBER." >&2;}
1.22 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This typically indicates a broken setup, and is not supported" >&5
1.23 $as_echo "$as_me: WARNING: This typically indicates a broken setup, and is not supported" >&2;}
1.24 fi
1.25
1.26 - # We only check CC_VERSION since we assume CXX_VERSION is equal.
1.27 - if [[ "$CC_VERSION" =~ (.*\.){3} ]] ; then
1.28 + # We only check CC_VERSION_NUMBER since we assume CXX_VERSION_NUMBER is equal.
1.29 + if [[ "$CC_VERSION_NUMBER" =~ (.*\.){3} ]] ; then
1.30 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler version number has more than three parts (X.Y.Z): $CC_VERSION. Comparisons might be wrong." >&5
1.31 $as_echo "$as_me: WARNING: C compiler version number has more than three parts (X.Y.Z): $CC_VERSION. Comparisons might be wrong." >&2;}
1.32 fi
1.33
1.34 - if [[ "$CC_VERSION" =~ [0-9]{6} ]] ; then
1.35 + if [[ "$CC_VERSION_NUMBER" =~ [0-9]{6} ]] ; then
1.36 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong." >&5
1.37 $as_echo "$as_me: WARNING: C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong." >&2;}
1.38 fi
1.39
1.40 - COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", $1, $2, $3) }' <<< "$CC_VERSION"`
1.41 + COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", $1, $2, $3) }' <<< "$CC_VERSION_NUMBER"`
1.42
1.43
1.44 #
