--- qsampler/trunk/configure.ac	2016/03/03 08:37:48	2862
+++ qsampler/trunk/configure.ac	2016/08/15 09:35:49	2977
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.3.1.15, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.4.0.7, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -36,12 +36,6 @@
   [ac_qt4="$enableval"],
   [ac_qt4="no"])
 
-AC_ARG_ENABLE(qt5,
-  AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=yes)]),
-  [ac_qt5="$enableval"],
-  [ac_qt5="yes"])
-
-
 
 # Enable libgig availability.
 AC_ARG_ENABLE(libgig,
@@ -62,11 +56,7 @@
 
 
 # Standard installation base dirs.
-if test "$cross_compiling" = yes; then
-  ac_with_paths=""
-else
-  ac_with_paths="/usr /usr/local"
-fi
+ac_with_paths=""
 
 # Set for alternate Qt4/5 installation dir.
 AC_ARG_WITH(qt4,
@@ -84,14 +74,7 @@
 
 if test "x$ac_qt5_path" != "xno"; then
    ac_with_paths="$ac_with_paths $ac_qt5_path"
-   ac_qt5="yes"
-fi
-
-if test "x$ac_qt5" = "xno"; then
-   ac_qt4="yes"
-fi
-if test "x$ac_qt4" = "xyes"; then
-   ac_qt5="no"
+   ac_qt4="no"
 fi
 
 # Set for alternate liblscp installation dir.
@@ -111,14 +94,11 @@
 
 
 # Checks for programs.
-AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_CXXCPP
-AC_PROG_GCC_TRADITIONAL
 
 # Checks for languages.
-AC_LANG_C
 AC_LANG_CPLUSPLUS
 
 PKG_PROG_PKG_CONFIG
@@ -161,8 +141,7 @@
 
 if test "x$ac_qt4" = "xyes"; then
    AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)
-fi
-if test "x$ac_qt5" = "xyes"; then
+else
    AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)
 fi
 if test "x$ac_qmake" = "xno"; then
@@ -175,11 +154,14 @@
 
 # Check for proper Qt4/5 major version.
 ac_qt_version_major=`$ac_qmake -query QT_VERSION | cut -d. -f1`
-if test "x$ac_qt4" = "xyes" -a "x$ac_qt_version_major" != "x4"; then
-   AC_MSG_ERROR([qmake-qt4 $ac_errmsg (qt4-devel)])
-fi
-if test "x$ac_qt5" = "xyes" -a "x$ac_qt_version_major" != "x5"; then
-   AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
+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)])
+   fi
+else
+   if test "x$ac_qt_version_major" != "x5"; then
+      AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
+   fi
 fi
 
 ac_qt_install_bins=`$ac_qmake -query QT_INSTALL_BINS`
@@ -222,9 +204,7 @@
          exit 1
       ])
    ])
-fi
- 
-if test "x$ac_qt5" = "xyes"; then
+else
    AC_CACHE_CHECK([for Qt library version >= 5.1],
       ac_cv_qtversion, [
       AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [