--- qsampler/trunk/configure.ac	2016/09/24 11:55:52	2988
+++ qsampler/trunk/configure.ac	2016/10/26 16:39:12	3028
@@ -1,12 +1,20 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.4.1.2, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.4.1.9, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 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.])
+
 # Sanitize version string.
-ac_version=$(echo $PACKAGE_VERSION | sed -r 's/^([0-9|\.]+).*$/\1/')
+AC_CACHE_VAL([ac_cv_build_version],
+   [ac_cv_build_version=$(echo $PACKAGE_VERSION | sed -r 's/^([[0-9|\.]]+).*$/\1/')])
+ac_version="$ac_cv_build_version"
 AC_SUBST(ac_version)
 
 # Set default installation prefix.
@@ -130,8 +138,20 @@
 # Check for pkg-config.
 PKG_PROG_PKG_CONFIG
 
+# Check whether -std=c++11 support is necessary (4 < g++ version < 6).
+AC_CACHE_CHECK([for g++ version], [ac_cv_gxx_version], [
+   ac_cv_gxx_version=$($CC -dumpversion)
+   if test -n "$ac_cv_gxx_version"; then
+      ac_cv_gxx_version=$(echo $ac_cv_gxx_version | cut -d'.' -f1);
+   fi
+])
+ac_gxx_version=$((ac_cv_gxx_version + 0))
+if test $ac_gxx_version -gt 4 -a $ac_gxx_version -lt 6; then
+   CXXFLAGS="$CXXFLAGS -std=c++11"
+fi
+
 # Check for proper flags.
-ac_arch=`uname -m`
+ac_arch=$(uname -m)
 
 # Check for install paths and alternatives...
 ac_libdirs="lib"
@@ -180,7 +200,7 @@
 fi
 
 # Check for proper Qt4/5 major version.
-ac_qt_version_major=`$ac_qmake -query QT_VERSION | cut -d. -f1`
+ac_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d. -f1)
 if test "x$ac_qt4" = "xyes"; then
    if test "x$ac_qt_version_major" != "x4"; then
       AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])
@@ -191,7 +211,7 @@
    fi
 fi
 
-ac_qt_install_bins=`$ac_qmake -query QT_INSTALL_BINS`
+ac_qt_install_bins=$($ac_qmake -query QT_INSTALL_BINS)
 if test -d $ac_qt_install_bins; then
    ac_path="$ac_qt_install_bins:$ac_path"
 fi
@@ -205,14 +225,14 @@
 
 AC_SUBST(ac_qmake)
 
-ac_qt_install_headers=`$ac_qmake -query QT_INSTALL_HEADERS`
+ac_qt_install_headers=$($ac_qmake -query QT_INSTALL_HEADERS)
 if test -d $ac_qt_install_headers; then
    CFLAGS="-I$ac_qt_install_headers $CFLAGS "
    CPPFLAGS="-I$ac_qt_install_headers $CPPFLAGS"
    ac_incpath="$ac_qt_install_headers $ac_incpath"
 fi
 
-ac_qt_install_libs=`$ac_qmake -query QT_INSTALL_LIBS`
+ac_qt_install_libs=$($ac_qmake -query QT_INSTALL_LIBS)
 if test -d $ac_qt_install_libs; then
    LIBS="-L$ac_qt_install_libs $LIBS"
    ac_libs="-L$ac_qt_install_libs $ac_libs"
@@ -435,34 +455,12 @@
    AC_DEFINE(CONFIG_ROUND, 1, [Define if round is available.])
 fi
 
-# Check for X11 unique/single instance.
-if test "x$ac_xunique" = "xyes"; then
-   AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if X11 unique/single instance is enabled.])
-fi
-
-# Check for debugging stack-trace.
-if test "x$ac_stacktrace" = "xyes"; then
-   AC_DEFINE(CONFIG_STACKTRACE, 1, [Define if debugger stack-trace is enabled.])
-fi
-
-# Some recent distros (eg. fedora, debian) require this.
-if test "x$ac_cv_lib_X11_main" = "xyes"; then
-   ac_libs="$ac_libs -lX11"
-fi
-
-AC_SUBST(ac_libs)
-
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h signal.h sys/socket.h)
 
-AC_CHECK_HEADER(lscp/client.h, [ac_lscp_h="yes"], [ac_lscp_h="no"])
-if test "x$ac_lscp_h" = "xno"; then
-   AC_MSG_ERROR([LSCP headers not found.])
-fi
-
 if test "x$ac_libgig" = "xyes"; then
    AC_CHECK_HEADER(libgig/SF.h, [ac_libgig_sf2="yes"], [ac_libgig_sf2="no"])
    if test "x$ac_libgig_sf2" = "xyes"; then
@@ -470,9 +468,28 @@
    fi
 fi
 
-AC_SUBST(ac_incpath)
+# Check for X11 unique/single instance.
+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
+      ac_qx11extras="x11extras"
+   fi
+   # Some recent distros (eg. fedora, debian) require this.
+   if test "x$ac_cv_lib_X11_main" = "xyes"; then
+      ac_libs="$ac_libs -lX11"
+   fi
+fi
+AC_SUBST(ac_qx11extras)
+
+# Check for debugging stack-trace.
+if test "x$ac_stacktrace" = "xyes"; then
+   AC_DEFINE(CONFIG_STACKTRACE, 1, [Define if debugger stack-trace is enabled.])
+fi
+
 AC_SUBST(ac_cflags)
 AC_SUBST(ac_ldflags)
+AC_SUBST(ac_incpath)
+AC_SUBST(ac_libs)
 
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -489,7 +506,7 @@
 # Output summary message
 
 echo
-echo "  $PACKAGE_NAME $PACKAGE_VERSION"
+echo "  $PACKAGE_NAME $PACKAGE_VERSION  ($ac_build_date)"
 echo
 echo "  Build target . . . . . . . . . . . . . . . . . . .: $ac_debug"
 echo