[GRASS-SVN] r72780 - grass/trunk

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-06-06 13:15:00 -0700 (Wed, 06 Jun 2018)
New Revision: 72780

Modified:
   grass/trunk/configure
   grass/trunk/configure.in
Log:
configure: fix version check

Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2018-06-06 19:17:06 UTC (rev 72779)
+++ grass/trunk/configure	2018-06-06 20:15:00 UTC (rev 72780)
@@ -5874,7 +5874,7 @@
 
     echo "$ac_t""found PROJ version "${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}"" 1>&6
     # minimum required PROJ 5+ version to use the new PROJ API: 5.1.0
-    if test ${proj_ver_major} = 5 && test `expr "proj_ver_minor" \< 1` = 1 ; then
+    if test ${proj_ver_major} = 5 && test `expr ${proj_ver_minor} \< 1` = 1 ; then
 	echo "configure: warning: At least PROJ version "5.1.0" is required for the new API " 1>&2
 	PROJ4API=1
     fi
@@ -6051,7 +6051,7 @@
 CPPFLAGS=$ac_save_cppflags
 
 
-	if test `expr "$proj_ver" \< 446` = 1 ; then
+	if test `expr ${proj_ver} \< 446` = 1 ; then
 	    { echo "configure: error: *** PROJ.4.4.6 or later is required." 1>&2; exit 1; }
 	fi
     fi

Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2018-06-06 19:17:06 UTC (rev 72779)
+++ grass/trunk/configure.in	2018-06-06 20:15:00 UTC (rev 72780)
@@ -693,7 +693,7 @@
     LOC_CHECK_VERSION_INT(proj.h,PROJ_VERSION_PATCH,External PROJ patch,proj_ver_patch,$PROJINC,0)
     AC_MSG_RESULT([found PROJ version "${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}"])
     # minimum required PROJ 5+ version to use the new PROJ API: 5.1.0
-    if test ${proj_ver_major} = 5 && test `expr "proj_ver_minor" \< 1` = 1 ; then
+    if test ${proj_ver_major} = 5 && test `expr ${proj_ver_minor} \< 1` = 1 ; then
 	AC_MSG_WARN([At least PROJ version "5.1.0" is required for the new API ])
 	PROJ4API=1
     fi
@@ -718,7 +718,7 @@
     else
 	LOC_CHECK_VERSION_INT(proj_api.h,PJ_VERSION,External PROJ.4,proj_ver,$PROJINC,0)
 
-	if test `expr "$proj_ver" \< 446` = 1 ; then
+	if test `expr ${proj_ver} \< 446` = 1 ; then
 	    AC_MSG_ERROR([*** PROJ.4.4.6 or later is required.])
 	fi
     fi