Skip to content

Remove bashisms from configure.ac #810

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

Merged
mojaveazure merged 1 commit into from
Mar 28, 2025
Merged

Remove bashisms from configure.ac #810

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
6 changes: 3 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ AC_ARG_WITH([tiledb],
#echo "with_tiledb: ${with_tiledb}"

## Sanity check
if test ! -z "${with_tiledb}" -a x"${enable_building}" = x"yes"; then
if test ! -z "${with_tiledb}" && test x"${enable_building}" = x"yes"; then
AC_MSG_ERROR([Conflicting choice of preinstalled TileDB and enabling building TileDB.])
fi

Expand All @@ -148,7 +148,7 @@ AC_ARG_WITH([download],
[])

## Sanity checks
if test ! -z "${with_tiledb}" -a x"${with_download}" = x"yes"; then
if test ! -z "${with_tiledb}" && test x"${with_download}" = x"yes"; then
AC_MSG_ERROR([Conflicting choice of preinstalled TileDB and enabling download of TileDB library.])
fi
## -- We allow this now as --with-download implies enable_building
Expand Down Expand Up @@ -254,7 +254,7 @@ if test x"${have_tiledb}" = x"no"; then
## - but also check we're on x86_64 before downloading
else

if test x"${machine}" = x"x86_64" && test x"${uname}" = x"Linux" -o x"${uname}" = x"Darwin"; then
if test x"${machine}" = x"x86_64" && (test x"${uname}" = x"Linux" || test x"${uname}" = x"Darwin"); then
AC_MSG_RESULT([downloading x86_64 TileDB library...])

osrel=`tools/getOsRelease.sh`
Expand Down
Loading