@@ -674,7 +674,7 @@ AS_IF([test "x$enable_grammarchecker" != "xno"],
674
674
then: pipx install git+https://github.com/divvun/giellaltgramtools
675
675
] ) ] ) ,
676
676
AC_MSG_RESULT ( yes ) )
677
- _gtgramtool_min_version=1.0.1
677
+ _gtgramtool_min_version=0.7.0
678
678
gtgramtool_too_old_message="gtgramtool needs to be updated.
679
679
If you installed it with pipx, run:
680
680
pipx upgrade GiellaLTGramTools"
@@ -683,25 +683,10 @@ AS_IF([test "x${GTGRAMTOOL}" != xno],
683
683
[ _gtgramtool_version=$( "${GTGRAMTOOL}" --version | sed -e 's/^.*version //')] ,
684
684
[ _gtgramtool_version=0] )
685
685
AC_MSG_RESULT ( [ $_gtgramtool_version] )
686
-
687
- # Function to compare version numbers
688
- m4_define ( [ compare_versions] , [
689
- m4_split ( [ _gtgramtool_version] , [ gtgramtool_version_parts] , [ \[ \.\] ] )
690
- m4_split ( [ _gtgramtool_min_version] , [ min_version_parts] , [ \[ \.\] ] )
691
- gtgramtool_version_ok=yes
692
- for i in 1 2 3; do
693
- if test ${gtgramtool_version_parts[ $i] } -lt ${min_version_parts[ $i] }; then
694
- gtgramtool_version_ok=no
695
- break
696
- elif test ${gtgramtool_version_parts[ $i] } -gt ${min_version_parts[ $i] }; then
697
- break
698
- fi
699
- done
700
- ] )
701
-
702
686
AS_IF ( [ test "x$enable_grammarchecker" != "xno"] ,
703
687
AC_MSG_CHECKING ( [ whether the gtgramtool version is at least $_gtgramtool_min_version] )
704
- compare_versions
688
+ AX_COMPARE_VERSION ( [ $_gtgramtool_version] , [ ge] , [ $_gtgramtool_min_version] ,
689
+ [ gtgramtool_version_ok=yes] , [ gtgramtool_version_ok=no] )
705
690
AS_IF ( [ test "x${gtgramtool_version_ok}" != xno] ,
706
691
[ AC_MSG_RESULT ( [ $gtgramtool_version_ok] ) ] ,
707
692
[ AC_MSG_ERROR ( [ $gtgramtool_too_old_message] ) ] ) )
0 commit comments