--- qsampler/trunk/configure.in	2004/07/06 10:54:45	176
+++ qsampler/trunk/configure.in	2004/11/19 10:18:59	303
@@ -22,6 +22,12 @@
    AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
 fi
 
+dnl Enable libgig availability.
+AC_ARG_ENABLE(libgig,
+  [  --disable-libgig        disable libgig interface (default=no)],
+  [ac_libgig="no"],
+  [ac_libgig="yes"])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -85,21 +91,21 @@
 ac_qtdir_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt3-devel)."
 
 dnl Check for Qt qmake utility.
-AC_PATH_PROG(ac_qmake, qmake, [no], $ac_qtdir/bin:${PATH})
+AC_PATH_PROG(ac_qmake, qmake, [no], $QTDIR/bin:${PATH})
 if test "x$ac_qmake" = "xno"; then
    AC_MSG_ERROR([qmake $ac_qtdir_errmsg])
 fi
 AC_SUBST(ac_qmake)
 
 dnl Check for Qt moc utility.
-AC_PATH_PROG(ac_moc, moc, [no])
+AC_PATH_PROG(ac_moc, moc, [no], $QTDIR/bin:${PATH})
 if test "x$ac_moc" = "xno"; then
    AC_MSG_ERROR([moc $ac_qtdir_errmsg])
 fi
 AC_SUBST(ac_moc)
 
 dnl Check for Qt uic utility.
-AC_PATH_PROG(ac_uic, uic, [no])
+AC_PATH_PROG(ac_uic, uic, [no], $QTDIR/bin:${PATH})
 if test "x$ac_uic" = "xno"; then
    AC_MSG_ERROR([uic $ac_qtdir_errmsg])
 fi
@@ -111,21 +117,29 @@
 AC_CHECK_LIB(Xext, main)
 AC_CHECK_LIB($ac_qtlib, main)
 
+dnl Check for round math function.
+AC_CHECK_LIB(m, round, [ac_round="yes"], [ac_round="no"])
+if test "x$ac_round" = "xyes"; then
+   AC_DEFINE(CONFIG_ROUND, 1, [Define if round is available.])
+fi
+
+dnl Check for mandatory libraries.
 AC_CHECK_LIB(lscp, main, [ac_liblscp="yes"], [ac_liblscp="no"])
 if test "x$ac_liblscp" = "xno"; then
    AC_MSG_ERROR([LSCP library not found.])
 fi
+ac_libs="-llscp"
 
-AC_CHECK_LIB(gig, main, [ac_libgig="yes"], [ac_libgig="no"])
+dnl Check for optional libraries.
 if test "x$ac_libgig" = "xyes"; then
-   AC_DEFINE(CONFIG_LIBGIG, 1, [Define if libgig is available.])
+   AC_CHECK_LIB(gig, main, [ac_libgig="yes"], [ac_libgig="no"])
+   if test "x$ac_libgig" = "xyes"; then
+      AC_DEFINE(CONFIG_LIBGIG, 1, [Define if libgig is available.])
+      ac_libs="-lgig $ac_libs"
+   fi
 fi
 
-dnl Check for round math function.
-AC_CHECK_LIB(m, round, [ac_round="yes"], [ac_round="no"])
-if test "x$ac_round" = "xyes"; then
-   AC_DEFINE(CONFIG_ROUND, 1, [Define if round is available.])
-fi
+AC_SUBST(ac_libs)
 
 dnl Checks for header files.
 AC_HEADER_STDC