File tree 2 files changed +20
-18
lines changed 2 files changed +20
-18
lines changed Original file line number Diff line number Diff line change @@ -2274,15 +2274,15 @@ RVER_MAJOR=`echo ${RVER} | cut -f1 -d"."`
2274
2274
RVER_MINOR=` echo ${RVER} | cut -f2 -d" ." `
2275
2275
RVER_PATCH=` echo ${RVER} | cut -f3 -d" ." `
2276
2276
2277
- if test $RVER_MAJOR = " development" ; then
2277
+ # if test [ $RVER_MAJOR = "development"] ; then
2278
2278
CXX=` " ${RBIN} " CMD config CXX`
2279
- else
2280
- if test $RVER_MAJOR -lt 3 -o $RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3; then
2281
- as_fn_error $? " sf is not compatible with R versions before 3.3.0" " $LINENO " 5
2282
- else
2283
- CXX=` " ${RBIN} " CMD config CXX`
2284
- fi
2285
- fi
2279
+ # else
2280
+ # if test [ $RVER_MAJOR -lt 3] -o [ $RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3] ; then
2281
+ # AC_MSG_ERROR([ sf is not compatible with R versions before 3.3.0])
2282
+ # else
2283
+ # CXX=`"${RBIN}" CMD config CXX`
2284
+ # fi
2285
+ # fi
2286
2286
2287
2287
# pick all flags for testing from R
2288
2288
: ${CC=`" ${RBIN} " CMD config CC`}
@@ -2432,7 +2432,8 @@ else
2432
2432
printf " %s\n" " yes" >&6 ; }
2433
2433
fi
2434
2434
2435
- if test ${GDAL_MAJ_VER} -eq 3 -a ${GDAL_MIN_VER} -eq 6 -a ${GDAL_PATCH_VER} -eq 0 ; then
2435
+ # if test [${GDAL_MAJ_VER} -eq 3] -a [${GDAL_MIN_VER} -eq 6] -a [${GDAL_PATCH_VER} -eq 0] ; then
2436
+ if test " ${GDAL_VERSION} " = " 3.6.0" ; then
2436
2437
as_fn_error $? " GDAL version 3.6.0 has been withdrawn, please update GDAL" " $LINENO " 5
2437
2438
fi
2438
2439
Original file line number Diff line number Diff line change @@ -19,15 +19,15 @@ RVER_MAJOR=`echo ${RVER} | cut -f1 -d"."`
19
19
RVER_MINOR=`echo ${RVER} | cut -f2 -d"."`
20
20
RVER_PATCH=`echo ${RVER} | cut -f3 -d"."`
21
21
22
- if test [ $RVER_MAJOR = "development"] ; then
22
+ # if test [$RVER_MAJOR = "development"]; then
23
23
CXX=`"${RBIN}" CMD config CXX`
24
- else
25
- if test [ $RVER_MAJOR -lt 3] -o [ $RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3] ; then
26
- AC_MSG_ERROR ( [ sf is not compatible with R versions before 3.3.0] )
27
- else
28
- CXX=`"${RBIN}" CMD config CXX`
29
- fi
30
- fi
24
+ # else
25
+ # if test [$RVER_MAJOR -lt 3] -o [$RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3]; then
26
+ # AC_MSG_ERROR([sf is not compatible with R versions before 3.3.0])
27
+ # else
28
+ # CXX=`"${RBIN}" CMD config CXX`
29
+ # fi
30
+ # fi
31
31
32
32
# pick all flags for testing from R
33
33
: ${CC=`"${RBIN}" CMD config CC`}
110
110
AC_MSG_RESULT ( yes )
111
111
fi
112
112
113
- if test [ ${GDAL_MAJ_VER} -eq 3] -a [ ${GDAL_MIN_VER} -eq 6] -a [ ${GDAL_PATCH_VER} -eq 0] ; then
113
+ # if test [${GDAL_MAJ_VER} -eq 3] -a [${GDAL_MIN_VER} -eq 6] -a [${GDAL_PATCH_VER} -eq 0] ; then
114
+ if test "${GDAL_VERSION}" = "3.6.0" ; then
114
115
AC_MSG_ERROR ( [ GDAL version 3.6.0 has been withdrawn, please update GDAL] )
115
116
fi
116
117
You can’t perform that action at this time.
0 commit comments