--- qsampler/trunk/configure.ac 2017/01/13 16:35:41 3086 +++ qsampler/trunk/configure.ac 2017/04/28 07:30:24 3133 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.4.2, rncbc@rncbc.org, qsampler) +AC_INIT(Qsampler, 0.4.3, rncbc@rncbc.org, qsampler) AC_CONFIG_SRCDIR(src/qsampler.cpp) AC_CONFIG_HEADERS(src/config.h) @@ -9,9 +9,13 @@ 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/^[[^_]]+_//') - 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]]" + fi else ac_cv_build_version=$PACKAGE_VERSION fi