max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Remove some bashisms from configure.ac"

Browse source 
This reverts commit e8b0efdcc9.
This commit is contained in:
Eelco Dolstra 2019-01-10 10:10:44 +01:00
parent 7af5f70139
commit 44a8b17556
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -212,11 +212,9 @@ AC_SUBST(ENABLE_S3, [$enable_s3])
AC_LANG_POP(C++) AC_LANG_POP(C++)
if test -n "$enable_s3"; then 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 '.' ' ')" declare -a 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}')" AC_DEFINE_UNQUOTED([AWS_VERSION_MAJOR], ${aws_version_tokens@<:@0@:>@}, [Major version of aws-sdk-cpp.])
aws_minor_version="$(awk -v ver="${aws_version_tokens}" '{print $2}')" AC_DEFINE_UNQUOTED([AWS_VERSION_MINOR], ${aws_version_tokens@<:@1@:>@}, [Minor version of aws-sdk-cpp.])
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.])
fi fi
@ -274,12 +272,9 @@ AC_SUBST(sandbox_shell)
test "$prefix" = NONE && prefix=$ac_default_prefix test "$prefix" = NONE && prefix=$ac_default_prefix
test "$exec_prefix" = NONE && exec_prefix='${prefix}' test "$exec_prefix" = NONE && exec_prefix='${prefix}'
for name in $ac_subst_vars; do for name in $ac_subst_vars; do
for _ in 1 2 3; do declare $name="$(eval echo "${!name}")"
if printf '%s' "${name}" | egrep '^[_[:alpha:]][_[:alnum:]]*$' declare $name="$(eval echo "${!name}")"
then declare $name="$(eval echo "${!name}")"
eval "${name}"="$(eval echo "\${${name}}")"
fi
done
done done
rm -f Makefile.config rm -f Makefile.config