diff options
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 59f3e68d63..ff2739c86f 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -14762,7 +14762,7 @@ DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 $as_echo_n "checking for GCC 3 or later... " >&6; } - gccmajor=`echo "$gccversion" | sed -e 's/^\([0-9]\+\)\..*$/\1/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9][0-9]*\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 diff --git a/src/configure.ac b/src/configure.ac index bf10eac551..fe2022802b 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -4447,7 +4447,7 @@ dnl the number before the version number. DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then AC_MSG_CHECKING(for GCC 3 or later) - gccmajor=`echo "$gccversion" | sed -e 's/^\([[0-9]]\+\)\..*$/\1/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]][[0-9]]*\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" AC_MSG_RESULT(yes) diff --git a/src/version.c b/src/version.c index 82f1003beb..29c1614784 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 228, +/**/ 227, /**/ 226, |