--- qsampler/trunk/configure.ac	2015/01/22 19:01:32	2718
+++ qsampler/trunk/configure.ac	2015/05/23 12:37:34	2765
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.2.3.18, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.3.0.2, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -133,9 +133,12 @@
 ac_topdirs="/usr/share /usr/lib"
 
 if test "x$ac_arch" = "xx86_64"; then
+   ac_topdirs="$ac_topdirs /usr/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
@@ -163,9 +166,9 @@
         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"
+    CFLAGS="$CFLAGS -I$X/include"
+    CPPFLAGS="$CPPFLAGS -I$X/include"
+    ac_incpath="$ac_incpath $X/include"
   fi
   if test "x$ac_arch" = "xx86_64" -a -d $X/lib64; then
     LIBS="-L$X/lib64 $LIBS"
@@ -182,7 +185,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 +199,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", [