--- qsampler/trunk/configure.ac 2017/04/27 11:09:16 3128 +++ qsampler/trunk/configure.ac 2017/07/18 06:30:46 3313 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.4.3, rncbc@rncbc.org, qsampler) +AC_INIT(Qsampler, 0.4.4, rncbc@rncbc.org, qsampler) AC_CONFIG_SRCDIR(src/qsampler.cpp) AC_CONFIG_HEADERS(src/config.h) @@ -9,9 +9,9 @@ AC_CACHE_VAL([ac_cv_build_version], [ ac_cv_build_version=$(git describe --tags --dirty --abbrev=6 2>/dev/null) if test -n "$ac_cv_build_version"; then - ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/^[^_]*[_v]//i') - ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/-g/git./') - ac_cv_build_version=$(echo $ac_cv_build_version | sed -r 's/[[_|-]]+/./g') + ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/^[[^_]]*[[_v]]//i') + ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/-g/git./') + ac_cv_build_version=$(echo $ac_cv_build_version | sed 's/[[_|-]]\+/./g') ac_cv_build_version_extra=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) if test "x$ac_cv_build_version_extra" != "xmaster"; then ac_cv_build_version="$ac_cv_build_version [[$ac_cv_build_version_extra]]" @@ -25,7 +25,7 @@ # Sanitized version string. AC_CACHE_VAL([ac_cv_version], [ - ac_cv_version=$(echo $ac_cv_build_version | sed -r 's/^([[0-9|\.]]+).*$/\1/') + ac_cv_version=$(echo $PACKAGE_VERSION | sed -r 's/^([[0-9|\.]]+).*$/\1/') ]) ac_version="$ac_cv_version" AC_DEFINE_UNQUOTED(CONFIG_VERSION, ["$ac_version"], [Version string.]) @@ -161,7 +161,7 @@ ac_gxx_version_major=$(($ac_cv_gxx_version_major + 0)) ]) ac_gxx_version_major=$ac_cv_gxx_version_major -if test $ac_gxx_version_major -gt 4 -a $ac_gxx_version_major -lt 6; then +if test $ac_gxx_version_major -ge 4 -a $ac_gxx_version_major -lt 6; then CXXFLAGS="-std=c++11 $CXXFLAGS" fi