--- qsampler/trunk/configure.ac	2015/03/25 09:24:40	2725
+++ qsampler/trunk/configure.ac	2015/06/15 14:11:33	2779
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.3.0, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.3.0.4, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -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.
@@ -130,19 +130,25 @@
    ac_qtdirs="qt5 $ac_qtdirs"
 fi
 
-ac_topdirs="/usr/share /usr/lib"
+ac_topdirs="/usr/local /usr"
+ac_subdirs="lib"
 
 if test "x$ac_arch" = "xx86_64"; then
+   ac_subdirs="$ac_subdirs 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 Y in share $ac_subdirs; do
+    for Z in $ac_qtdirs; do
+      if test -d $X/$Y/$Z/bin; then
+         ac_with_paths="$X/$Y/$Z $ac_with_paths"
+      fi
+    done
   done
 done
 
@@ -152,9 +158,6 @@
   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
@@ -163,18 +166,16 @@
         ac_incpath="$X/include/$Y $ac_incpath"
       fi
     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 Y in $ac_subdirs; do
+    if test -d $X/$Y; then
+       LIBS="-L$X/$Y $LIBS"
+       ac_libs="-L$X/$Y $ac_libs"
+    fi
+  done
 done
 
 # Check for proper Qt4/5 version.
@@ -182,7 +183,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 +197,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", [