--- qsampler/trunk/configure.ac	2016/12/03 09:47:38	3049
+++ qsampler/trunk/configure.ac	2017/04/27 11:09:16	3128
@@ -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/^[^_]*[_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_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
@@ -336,6 +340,9 @@
    AC_DEFINE(CONFIG_LIBLSCP, 1, [Define if liblscp is available.])
    ac_cflags="$ac_cflags $LSCP_CFLAGS"
    ac_libs="$ac_libs $LSCP_LIBS"
+   CFLAGS="$CFLAGS $LSCP_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $LSCP_CFLAGS"
+   LIBS="$LIBS $LSCP_LIBS"
 else
    AC_MSG_ERROR([*** LSCP library not found (liblscp).])
 fi
@@ -468,6 +475,9 @@
    AC_DEFINE(CONFIG_LIBGIG, 1, [Define if libgig is available.])
    ac_cflags="$ac_cflags $GIG_CFLAGS"
    ac_libs="$ac_libs $GIG_LIBS"
+   CFLAGS="$CFLAGS $GIG_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $GIG_CFLAGS"
+   LIBS="$LIBS $GIG_LIBS"
    AC_DEFINE(CONFIG_LIBGIG_SETAUTOLOAD, 1, [Define if libgig provides gig::File::SetAutoLoad() method.])
    ac_libgig_setautoload="yes"
 else