--- qsampler/trunk/configure.ac	2015/03/09 09:13:24	2724
+++ qsampler/trunk/configure.ac	2015/07/23 17:32:31	2829
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.2.3.21, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.3.1, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -32,14 +32,14 @@
 
 # Enable Qt4/5 availability.
 AC_ARG_ENABLE(qt4,
-  AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=yes)]),
+  AC_HELP_STRING([--enable-qt4], [enable Qt4 build (default=no)]),
   [ac_qt4="$enableval"],
-  [ac_qt4="yes"])
+  [ac_qt4="no"])
 
 AC_ARG_ENABLE(qt5,
-  AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=no)]),
+  AC_HELP_STRING([--enable-qt5], [enable Qt5 build (default=yes)]),
   [ac_qt5="$enableval"],
-  [ac_qt5="no"])
+  [ac_qt5="yes"])
 
 
 
@@ -59,7 +59,7 @@
 if test "$cross_compiling" = yes; then
   ac_with_paths=""
 else
-  ac_with_paths="/usr /usr/local"
+  ac_with_paths="/usr/local /usr"
 fi
 
 # Set for alternate Qt4/5 installation dir.
@@ -81,11 +81,11 @@
    ac_qt5="yes"
 fi
 
-if test "x$ac_qt4" = "xno"; then
-   ac_qt5="yes"
+if test "x$ac_qt5" = "xno"; then
+   ac_qt4="yes"
 fi
-if test "x$ac_qt5" = "xyes"; then
-   ac_qt4="no"
+if test "x$ac_qt4" = "xyes"; then
+   ac_qt5="no"
 fi
 
 # Set for alternate liblscp installation dir.
@@ -130,51 +130,59 @@
    ac_qtdirs="qt5 $ac_qtdirs"
 fi
 
-ac_topdirs="/usr/share /usr/lib"
+ac_topdirs="/usr/local /usr"
+ac_libdirs="lib"
 
 if test "x$ac_arch" = "xx86_64"; then
+   ac_libdirs="$ac_libdirs lib64"
+fi
+
+if test "x$ac_arch" = "xx86_64" -o "x$ac_qt5" = "xyes"; then
    CFLAGS="-fPIC $CFLAGS"
    CPPFLAGS="-fPIC $CPPFLAGS"
-   ac_topdirs="$ac_topdirs /usr/lib64"
 fi
 
 for X in $ac_topdirs; do
-  for Y in $ac_qtdirs; do
-    if test -d $X/$Y/bin; then
-      ac_with_paths="$X/$Y $ac_with_paths"
-    fi
+  for Y1 in share $ac_libdirs; do
+    for Y2 in $Y1 $Y1/${ac_arch}-linux-gnu; do
+      for Z in $ac_qtdirs; do
+        if test -d $X/$Y2/$Z/bin; then
+           ac_with_paths="$ac_with_paths $X/$Y2/$Z"
+        fi
+      done
+    done
   done
 done
 
 # Prepend alternate dependencies paths.
 ac_path=$PATH
+
 for X in $ac_with_paths; do
   if test -d $X/bin; then
     ac_path="$X/bin:$ac_path"
   fi
-# if test -x $X/qmake; then
-#   ac_path="$X:$ac_path"
-# fi
   if test -d $X/include; then
-    for Y in $ac_qtdirs; do
-      if test -d $X/include/$Y; then
-        CFLAGS="-I$X/include/$Y $CFLAGS"
-        CPPFLAGS="-I$X/include/$Y $CPPFLAGS"
-        ac_incpath="$X/include/$Y $ac_incpath"
-      fi
+    for Y in include include/${ac_arch}-linux-gnu; do
+      for Z in $ac_qtdirs; do
+        if test -d "$X/$Y/$Z"; then
+          CFLAGS="-I$X/$Y/$Z $CFLAGS"
+          CPPFLAGS="-I$X/$Y/$Z $CPPFLAGS"
+          ac_incpath="$X/$Y/$Z $ac_incpath"
+        fi
+      done
     done
-    CFLAGS="-I$X/include $CFLAGS"
-    CPPFLAGS="-I$X/include $CPPFLAGS"
-    ac_incpath="$X/include $ac_incpath"
-  fi
-  if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then
-    LIBS="-L$X/lib64 $LIBS"
-    ac_libs="-L$X/lib64 $ac_libs"
-  fi
-  if test -d $X/lib; then
-    LIBS="-L$X/lib $LIBS"
-    ac_libs="-L$X/lib $ac_libs"
+    CFLAGS="$CFLAGS -I$X/include"
+    CPPFLAGS="$CPPFLAGS -I$X/include"
+    ac_incpath="$ac_incpath $X/include"
   fi
+  for Y1 in $ac_libdirs; do
+    for Y2 in $Y1 $Y1/${ac_arch}-linux-gnu; do
+      if test -d $X/$Y2; then
+         LIBS="-L$X/$Y2 $LIBS"
+         ac_libs="-L$X/$Y2 $ac_libs"
+      fi
+    done
+  done
 done
 
 # Check for proper Qt4/5 version.
@@ -182,7 +190,7 @@
    AC_CACHE_CHECK([for Qt library version >= 4.4],
       ac_cv_qtversion, [
       AC_TRY_LINK([#include "QtCore/qglobal.h"], [
-         #if QT_VERSION < 0x040400
+         #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
          #error Qt library 4.4 or greater required.
          #endif
       ], ac_cv_qtversion="yes", [
@@ -196,7 +204,7 @@
    AC_CACHE_CHECK([for Qt library version >= 5.1],
       ac_cv_qtversion, [
       AC_TRY_LINK([#include "QtCore/qglobal.h"], [
-         #if QT_VERSION < 0x050100
+         #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
          #error Qt library 5.1 or greater required.
          #endif
       ], ac_cv_qtversion="yes", [