mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct the logic of when and how to link against amazon S3 AWS SDK libraries.

Browse Source
This commit is contained in:
Ward Fisher 2023-08-24 17:39:49 -05:00
parent d90abc5de4
commit 7333d09982
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -903,13 +903,14 @@ unset enable_nczarr_s3
# Note we check for the library after checking for enable_s3 # Note we check for the library after checking for enable_s3
# because for some reason this fails if we unconditionally test for sdk # because for some reason this fails if we unconditionally test for sdk
# and it is not available. Fix someday # and it is not available. Fix someday
S3LIBS=""
if test "x$enable_s3" = xyes ; then if test "x$enable_s3" = xyes ; then
# See if we have the s3 aws library # See if we have the s3 aws library
# Check for the AWS S3 SDK library # Check for the AWS S3 SDK library
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
AC_CHECK_LIB([aws-c-common], [aws_string_destroy], [enable_s3_aws=yes],[enable_s3_aws=no]) AC_CHECK_LIB([aws-c-common], [aws_string_destroy], [enable_s3_aws=yes],[enable_s3_aws=no])
if test "x$enable_s3_aws" = "xyes" ; then if test "x$enable_s3_aws" = "xyes" ; then
LIBS="$LIBS-laws-cpp-sdk-core -laws-cpp-sdk-s3" S3LIBS="-laws-cpp-sdk-core -laws-cpp-sdk-s3"
fi fi
AC_LANG_POP AC_LANG_POP
else else
@ -929,7 +930,7 @@ AC_MSG_RESULT($enable_s3_internal)
if test "x$enable_s3_aws" = xno && test "x$enable_s3_internal" = xno ; then if test "x$enable_s3_aws" = xno && test "x$enable_s3_internal" = xno ; then
AC_MSG_WARN([No S3 library available => S3 support disabled]) AC_MSG_WARN([No S3 library available => S3 support disabled])
enable_S3=no enable_s3=no
fi fi
if test "x$enable_s3_aws" = xyes && test "x$enable_s3_internal" = xyes ; then if test "x$enable_s3_aws" = xyes && test "x$enable_s3_internal" = xyes ; then
@ -966,11 +967,12 @@ if test "x$enable_s3" = xyes ; then
fi fi
if test "x$enable_s3_aws" = xyes ; then if test "x$enable_s3_aws" = xyes ; then
AC_DEFINE([ENABLE_S3_AWS], [1], [If true, then use aws S3 library]) LIBS="$LIBS$S3LIBS"
AC_DEFINE([ENABLE_S3_AWS], [1], [If true, then use aws S3 library])
fi fi
if test "x$enable_s3_internal" = xyes ; then if test "x$enable_s3_internal" = xyes ; then
AC_DEFINE([ENABLE_S3_INTERNAL], [1], [If true, then use internal S3 library]) AC_DEFINE([ENABLE_S3_INTERNAL], [1], [If true, then use internal S3 library])
fi fi
AC_DEFINE_UNQUOTED([WITH_S3_TESTING], [$with_s3_testing], [control S3 testing.]) AC_DEFINE_UNQUOTED([WITH_S3_TESTING], [$with_s3_testing], [control S3 testing.])