Skip to content

Commit

Permalink
Revert "Remove some bashisms from configure.ac"
Browse files Browse the repository at this point in the history
This reverts commit e8b0efd.
  • Loading branch information
edolstra committed Jan 10, 2019
1 parent 7af5f70 commit 44a8b17
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,9 @@ AC_SUBST(ENABLE_S3, [$enable_s3])
AC_LANG_POP(C++)

if test -n "$enable_s3"; then
aws_version_tokens="$(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' ')"
aws_major_version="$(awk -v ver="${aws_version_tokens}" '{print $1}')"
aws_minor_version="$(awk -v ver="${aws_version_tokens}" '{print $2}')"
AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_major_version}, [Major version of aws-sdk-cpp.])
AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_minor_version}, [Minor version of aws-sdk-cpp.])
declare -a aws_version_tokens=($(printf '#include <aws/core/VersionConfig.h>\nAWS_SDK_VERSION_STRING' | $CPP $CPPFLAGS - | grep -v '^#.*' | sed 's/"//g' | tr '.' ' '))
AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.])
AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.])
fi


Expand Down Expand Up @@ -274,12 +272,9 @@ AC_SUBST(sandbox_shell)
test "$prefix" = NONE && prefix=$ac_default_prefix
test "$exec_prefix" = NONE && exec_prefix='${prefix}'
for name in $ac_subst_vars; do
for _ in 1 2 3; do
if printf '%s' "${name}" | egrep '^[_[:alpha:]][_[:alnum:]]*$'
then
eval "${name}"="$(eval echo "\${${name}}")"
fi
done
declare $name="$(eval echo "${!name}")"
declare $name="$(eval echo "${!name}")"
declare $name="$(eval echo "${!name}")"
done

rm -f Makefile.config
Expand Down

0 comments on commit 44a8b17

Please sign in to comment.