Explorar o código

configure: fix version check

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72780 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz %!s(int64=6) %!d(string=hai) anos
pai
achega
66edaf4b2d
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 2 2
      configure
  2. 2 2
      configure.in

+ 2 - 2
configure

@@ -5874,7 +5874,7 @@ CPPFLAGS=$ac_save_cppflags
 
 
     echo "$ac_t""found PROJ version "${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}"" 1>&6
     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
     # 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
 	echo "configure: warning: At least PROJ version "5.1.0" is required for the new API " 1>&2
 	PROJ4API=1
 	PROJ4API=1
     fi
     fi
@@ -6051,7 +6051,7 @@ fi
 CPPFLAGS=$ac_save_cppflags
 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; }
 	    { echo "configure: error: *** PROJ.4.4.6 or later is required." 1>&2; exit 1; }
 	fi
 	fi
     fi
     fi

+ 2 - 2
configure.in

@@ -693,7 +693,7 @@ if test $PROJ4API = 0 ; then
     LOC_CHECK_VERSION_INT(proj.h,PROJ_VERSION_PATCH,External PROJ patch,proj_ver_patch,$PROJINC,0)
     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}"])
     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
     # 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 ])
 	AC_MSG_WARN([At least PROJ version "5.1.0" is required for the new API ])
 	PROJ4API=1
 	PROJ4API=1
     fi
     fi
@@ -718,7 +718,7 @@ else
     else
     else
 	LOC_CHECK_VERSION_INT(proj_api.h,PJ_VERSION,External PROJ.4,proj_ver,$PROJINC,0)
 	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.])
 	    AC_MSG_ERROR([*** PROJ.4.4.6 or later is required.])
 	fi
 	fi
     fi
     fi