--- qsampler/trunk/configure.in	2004/09/28 16:17:43	255
+++ qsampler/trunk/configure.in	2005/05/21 11:21:21	559
@@ -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
@@ -47,7 +53,8 @@
   ac_qtlib, [
   for X in qt-mt qt; do
     if test "x$ac_qtlib" = "x"; then
-      if test -f $QTDIR/lib/lib$X.so -o -f $QTDIR/lib/lib$X.a; then
+      if test -f $QTDIR/lib/lib$X.so -o -f $QTDIR/lib/lib$X.a \
+           -o -f $QTDIR/lib/lib$X.la -o -f $QTDIR/lib/lib$X.dylib; then
         ac_qtlib=$X
       fi
     fi
@@ -64,9 +71,9 @@
 fi
 AC_SUBST(ac_thread)
 
-CFLAGS="$CFLAGS -I$QTDIR/include"
-CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
-LIBS="-L$QTDIR/lib -L/usr/X11R6/lib"
+CFLAGS="$CFLAGS -I$QTDIR/include -I$QTDIR/include/qt"
+CPPFLAGS="$CPPFLAGS -I$QTDIR/include -I$QTDIR/include/qt"
+LIBS="-L$QTDIR/lib"
 
 AC_CACHE_CHECK([for Qt library version >= 3.1.1],
   ac_qtlib_version, [
@@ -111,26 +118,45 @@
 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"])
-if test "x$ac_libgig" = "xyes"; then
-   AC_DEFINE(CONFIG_LIBGIG, 1, [Define if libgig is available.])
+AC_CACHE_CHECK([for instrument_name in lscp_channel_info_t],
+  ac_instrument_name, [
+  AC_TRY_COMPILE([#include "lscp/client.h"], [
+	lscp_channel_info_t info;
+	info.instrument_name = 0;
+    ], ac_instrument_name="yes", ac_instrument_name="no")
+])
+if test "x$ac_instrument_name" = "xyes"; then
+   AC_DEFINE(CONFIG_INSTRUMENT_NAME, 1, [Define if instrument_name is available.])
 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.])
+dnl Check for optional libraries.
+if test "x$ac_libgig" = "xyes"; then
+   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
 
+AC_SUBST(ac_libs)
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h signal.h)
 
 dnl AC_CHECK_HEADER(lscp/client.h, [ac_lscp_h="yes"], [ac_lscp_h="no"])
 dnl if test "x$ac_lscp_h" = "xno"; then
@@ -146,7 +172,7 @@
 dnl Finally produce a configure header file and the makefiles.
 AC_OUTPUT(Makefile qsampler.pro)
 
-make clean > /dev/null 2>&1
+dnl make clean > /dev/null 2>&1
 
 echo ""
 echo "Now type 'make', followed by 'make install' as root."