--- qsampler/trunk/configure.ac	2010/03/29 17:00:30	2074
+++ qsampler/trunk/configure.ac	2011/09/04 21:50:14	2271
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.2.2.17, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.2.2.30, rncbc@rncbc.org, qsampler)
 
 AC_CONFIG_SRCDIR(src/qsampler.cpp)
 AC_CONFIG_HEADERS(src/config.h)
@@ -41,6 +41,7 @@
   [ac_stacktrace="$enableval"])
 
 
+if test "$cross_compiling" != yes; then
 # Standard installation base dirs.
 ac_with_paths="/usr /usr/local"
 
@@ -52,6 +53,7 @@
     fi
   done
 done
+fi
 
 # Set for alternate Qt installation dir.
 AC_ARG_WITH(qt,
@@ -111,14 +113,14 @@
 done
 
 # Check for proper Qt version.
-AC_CACHE_CHECK([for Qt library version >= 4.1],
+AC_CACHE_CHECK([for Qt library version >= 4.2],
   ac_cv_qtversion, [
   AC_TRY_LINK([#include "Qt/qglobal.h"], [
-#if QT_VERSION < 0x040100
-#error Qt library 4.1 or greater required.
+#if QT_VERSION < 0x040200
+#error Qt library 4.2 or greater required.
 #endif
     ], ac_cv_qtversion="yes", [
-      echo "no; Qt 4.1 or greater is required"
+      echo "no; Qt 4.2 or greater is required"
       exit
     ])
 ])
@@ -178,6 +180,12 @@
    AC_MSG_ERROR([LSCP library not found.])
 fi
 ac_libs="$ac_libs -llscp"
+case "{$host}" in
+     *mingw*)
+     ac_libs="$ac_libs -lws2_32"
+     LIBS="$LIBS -lws2_32"
+     ;;
+esac
 
 AC_CACHE_CHECK([for instrument_name in lscp_channel_info_t],
   ac_cv_instrument_name, [
@@ -302,17 +310,14 @@
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       CXXFLAGS="$ac_libs"
-      AC_TRY_RUN([
+      AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <gig.h>
-int main() {
+      ],[
     gig::File file;
     file.SetAutoLoad(false);
-    exit(0);
-}
       ],
       have_libgig_setautoload="yes",
-      have_libgig_setautoload="no",
       have_libgig_setautoload="no"
       )
       AC_LANG_RESTORE
@@ -334,13 +339,18 @@
    AC_DEFINE(CONFIG_STACKTRACE, 1, [Define if debugger stack-trace is enabled.])
 fi
 
+# Some recent distros (eg. fedora, debian) require this.
+if test "x$ac_cv_lib_X11_main" = "xyes"; then
+   ac_libs="$ac_libs -lX11"
+fi
+
 AC_SUBST(ac_libs)
 AC_SUBST(ac_incpath)
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h signal.h)
+AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h signal.h sys/socket.h)
 
 AC_CHECK_HEADER(lscp/client.h, [ac_lscp_h="yes"], [ac_lscp_h="no"])
 if test "x$ac_lscp_h" = "xno"; then