--- qsampler/trunk/configure.ac	2014/06/03 16:36:35	2592
+++ qsampler/trunk/configure.ac	2014/06/17 09:32:58	2643
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.2.3.7, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.2.3.10, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -62,7 +62,11 @@
 
 
 # Standard installation base dirs.
-ac_with_paths="/usr /usr/local"
+if test "$cross_compiling" = yes; then
+  ac_with_paths=""
+else
+  ac_with_paths="/usr /usr/local"
+fi
 
 # Set for alternate Qt installation dir.
 AC_ARG_WITH(qt,
@@ -353,7 +357,7 @@
    PKG_CHECK_MODULES(LIBGIG, gig >= 3.3.0, [ac_libgig="yes"], [ac_libgig="no"])
    AC_SUBST(LIBGIG_CFLAGS)
    AC_SUBST(LIBGIG_LIBS)
-   ac_cflags="$ac_libs $LIBGIG_CFLAGS"
+   ac_cflags="$ac_cflags $LIBGIG_CFLAGS"
    ac_libs="$ac_libs $LIBGIG_LIBS"
    if test "x$ac_libgig" = "xyes"; then
       AC_DEFINE(CONFIG_LIBGIG, 1, [Define if libgig is available.])