Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bashisms #2497

Merged
merged 1 commit into from
Jan 11, 2025
Merged

fix bashisms #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2274,15 +2274,15 @@ RVER_MAJOR=`echo ${RVER} | cut -f1 -d"."`
RVER_MINOR=`echo ${RVER} | cut -f2 -d"."`
RVER_PATCH=`echo ${RVER} | cut -f3 -d"."`

if test $RVER_MAJOR = "development"; then
#if test [$RVER_MAJOR = "development"]; then
CXX=`"${RBIN}" CMD config CXX`
else
if test $RVER_MAJOR -lt 3 -o $RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3; then
as_fn_error $? "sf is not compatible with R versions before 3.3.0" "$LINENO" 5
else
CXX=`"${RBIN}" CMD config CXX`
fi
fi
#else
# if test [$RVER_MAJOR -lt 3] -o [$RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3]; then
# AC_MSG_ERROR([sf is not compatible with R versions before 3.3.0])
# else
# CXX=`"${RBIN}" CMD config CXX`
# fi
#fi

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

if test ${GDAL_MAJ_VER} -eq 3 -a ${GDAL_MIN_VER} -eq 6 -a ${GDAL_PATCH_VER} -eq 0 ; then
#if test [${GDAL_MAJ_VER} -eq 3] -a [${GDAL_MIN_VER} -eq 6] -a [${GDAL_PATCH_VER} -eq 0] ; then
if test "${GDAL_VERSION}" = "3.6.0" ; then
as_fn_error $? "GDAL version 3.6.0 has been withdrawn, please update GDAL" "$LINENO" 5
fi

Expand Down
19 changes: 10 additions & 9 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ RVER_MAJOR=`echo ${RVER} | cut -f1 -d"."`
RVER_MINOR=`echo ${RVER} | cut -f2 -d"."`
RVER_PATCH=`echo ${RVER} | cut -f3 -d"."`

if test [$RVER_MAJOR = "development"]; then
#if test [$RVER_MAJOR = "development"]; then
CXX=`"${RBIN}" CMD config CXX`
else
if test [$RVER_MAJOR -lt 3] -o [$RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3]; then
AC_MSG_ERROR([sf is not compatible with R versions before 3.3.0])
else
CXX=`"${RBIN}" CMD config CXX`
fi
fi
#else
# if test [$RVER_MAJOR -lt 3] -o [$RVER_MAJOR -eq 3 -a $RVER_MINOR -lt 3]; then
# AC_MSG_ERROR([sf is not compatible with R versions before 3.3.0])
# else
# CXX=`"${RBIN}" CMD config CXX`
# fi
#fi

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

if test [${GDAL_MAJ_VER} -eq 3] -a [${GDAL_MIN_VER} -eq 6] -a [${GDAL_PATCH_VER} -eq 0] ; then
#if test [${GDAL_MAJ_VER} -eq 3] -a [${GDAL_MIN_VER} -eq 6] -a [${GDAL_PATCH_VER} -eq 0] ; then
if test "${GDAL_VERSION}" = "3.6.0" ; then
AC_MSG_ERROR([GDAL version 3.6.0 has been withdrawn, please update GDAL])
fi

Expand Down
Loading