Skip to content

Commit e1808c6

Browse files
committed
fix bashisms
1 parent 8616ff9 commit e1808c6

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

configure

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,15 +2274,15 @@ RVER_MAJOR=`echo ${RVER} | cut -f1 -d"."`
22742274
RVER_MINOR=`echo ${RVER} | cut -f2 -d"."`
22752275
RVER_PATCH=`echo ${RVER} | cut -f3 -d"."`
22762276

2277-
if test $RVER_MAJOR = "development"; then
2277+
#if test [$RVER_MAJOR = "development"]; then
22782278
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
22862286

22872287
# pick all flags for testing from R
22882288
: ${CC=`"${RBIN}" CMD config CC`}
@@ -2432,7 +2432,8 @@ else
24322432
printf "%s\n" "yes" >&6; }
24332433
fi
24342434

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
24362437
as_fn_error $? "GDAL version 3.6.0 has been withdrawn, please update GDAL" "$LINENO" 5
24372438
fi
24382439

configure.ac

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ RVER_MAJOR=`echo ${RVER} | cut -f1 -d"."`
1919
RVER_MINOR=`echo ${RVER} | cut -f2 -d"."`
2020
RVER_PATCH=`echo ${RVER} | cut -f3 -d"."`
2121

22-
if test [$RVER_MAJOR = "development"]; then
22+
#if test [$RVER_MAJOR = "development"]; then
2323
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
3131

3232
# pick all flags for testing from R
3333
: ${CC=`"${RBIN}" CMD config CC`}
@@ -110,7 +110,8 @@ else
110110
AC_MSG_RESULT(yes)
111111
fi
112112

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
114115
AC_MSG_ERROR([GDAL version 3.6.0 has been withdrawn, please update GDAL])
115116
fi
116117

0 commit comments

Comments
 (0)