72a884
From 5f6012039abb6ec9e9dfea801effa6b02fd102bc Mon Sep 17 00:00:00 2001
72a884
From: Vsevolod Kvachev <rasielll@gmail.com>
72a884
Date: Thu, 19 Apr 2018 23:04:37 +0300
72a884
Subject: [PATCH] Fix go version matching in configure for go1.10
72a884
72a884
---
72a884
 configure.ac | 10 +++++-----
72a884
 1 file changed, 5 insertions(+), 5 deletions(-)
72a884
72a884
diff --git a/configure.ac b/configure.ac
72a884
index 833cb37bf..ba1631743 100644
72a884
--- a/configure.ac
72a884
+++ b/configure.ac
72a884
@@ -2597,7 +2597,7 @@ else
72a884
     GOVERSIONOPTION=version
72a884
     go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
72a884
     case "$go_version" in
72a884
-    go1 | go1.[[01234]]*)
72a884
+    go1 | go1.[[01234]] | go1.[[01234]].*)
72a884
       GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
72a884
       ;;
72a884
     *)
72a884
@@ -2606,7 +2606,7 @@ else
72a884
     esac
72a884
     AC_MSG_CHECKING([whether go version is too old])
72a884
     case $go_version in
72a884
-    go1.1* | go1.0* | go1 )
72a884
+    go1.1.* | go1.1 | go1.0 | go1.0.* | go1 )
72a884
       AC_MSG_RESULT([yes - minimum version is 1.2])
72a884
       GO=
72a884
       GOOPT="-intgosize 32"
72a884
@@ -2624,13 +2624,13 @@ else
72a884
       ;;
72a884
     esac
72a884
     case $go_version in
72a884
-    go1.0* | go1 | go1.1*)
72a884
+    go1.0 | go1.0.* | go1 | go1.1 | go1.1.*)
72a884
       GOOPT="$GOOPT -use-shlib"
72a884
       ;;
72a884
-    go1.2*)
72a884
+    go1.2 | go1.2.*)
72a884
       GO12=true
72a884
       ;;
72a884
-    go1.3* | go1.4*)
72a884
+    go1.3 | go1.3.* | go1.4 | go1.4.*)
72a884
       GO13=true
72a884
       ;;
72a884
     *)
72a884
-- 
72a884
2.14.3
72a884