--- qsampler/trunk/configure.ac 2016/11/25 18:34:45 3048 +++ qsampler/trunk/configure.ac 2016/12/03 09:47:38 3049 @@ -5,15 +5,9 @@ AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_FILES(Makefile qsampler.spec src/src.pri src/qsampler.desktop) -# Build date and time. -AC_CACHE_VAL([ac_cv_build_date], - [ac_cv_build_date=$(date +"%b %d %Y %H:%M %z")]) -ac_build_date="$ac_cv_build_date" -AC_DEFINE_UNQUOTED(CONFIG_BUILD_DATE, ["$ac_build_date"], [Build date and time.]) - # Build version string. AC_CACHE_VAL([ac_cv_build_version], [ - ac_cv_build_version=$(git describe --tags --abbrev=6 2>/dev/null) + 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./') @@ -500,6 +494,9 @@ fi # Check for X11 unique/single instance. +if test "x$ac_xunique" = "xyes" -a "x$ac_qt4" = "xno"; then + PKG_CHECK_MODULES([QT5X11EXTRAS], [Qt5X11Extras], [ac_xunique="yes"], [ac_xunique="no"]) +fi if test "x$ac_xunique" = "xyes"; then AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if X11 unique/single instance is enabled.]) if test "x$ac_qt4" = "xno"; then @@ -537,7 +534,7 @@ # Output summary message echo -echo " $PACKAGE_NAME $ac_build_version ($ac_build_date)" +echo " $PACKAGE_NAME $ac_build_version" echo echo " Build target . . . . . . . . . . . . . . . . . . .: $ac_debug" echo