--- qsampler/trunk/configure.ac	2006/12/18 16:51:50	986
+++ qsampler/trunk/configure.ac	2007/10/05 17:41:49	1386
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.1.3.10, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.1.4.7, rncbc@rncbc.org, qsampler)
 AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui.h)
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_FILES(Makefile qsampler.pro qsampler.spec)
+AC_CONFIG_FILES(Makefile qsampler.pro qsampler.spec qsampler.desktop)
 
 # Set default installation prefix.
 AC_PREFIX_DEFAULT(/usr/local)
@@ -16,20 +16,34 @@
 # Enable debugging argument option.
 AC_ARG_ENABLE(debug,
   AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
-  [ac_debug="debug"],
-  [ac_debug="release"])
-AC_SUBST(ac_debug)
+  [ac_debug="$enableval"])
 
-if test "x$ac_debug" = "xdebug"; then
+if test "x$ac_debug" = "xyes"; then
    AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
+   ac_debug="debug"
+else
+   ac_debug="release"
 fi
+AC_SUBST(ac_debug)
 
 # Enable libgig availability.
 AC_ARG_ENABLE(libgig,
-  AC_HELP_STRING([--disable-libgig], [disable libgig interface (default=no)]),
-  [ac_libgig="no"],
+  AC_HELP_STRING([--enable-libgig], [enable libgig interface (default=yes)]),
+  [ac_libgig="$enableval"],
   [ac_libgig="yes"])
 
+# Standard installation base dirs.
+ac_with_paths="/usr /usr/local"
+
+# Some a-la-debian alternatives...
+for X in /usr/lib /usr/share; do
+  for Y in qt qt3; do
+    if test -d $X/$Y/bin; then
+      ac_with_paths="$ac_with_paths $X/$Y"
+    fi
+  done
+done
+
 # Set for alternate liblscp installation dir.
 AC_ARG_WITH(liblscp,
   AC_HELP_STRING([--with-liblscp=PATH], [use alternate liblscp install path]),
@@ -51,46 +65,43 @@
 AC_LANG_C
 AC_LANG_CPLUSPLUS
 
+# Check for QTDIR environment variable.
+AC_MSG_CHECKING([whether QTDIR environment variable is set])
+if test "x$QTDIR" = "x"; then
+  AC_MSG_RESULT([no])
+else
+  AC_MSG_RESULT([$QTDIR])
+  ac_with_paths="$ac_with_paths $QTDIR"
+fi
+
 # Prepend alternate dependencies paths.
+ac_path=$PATH
 for X in $ac_with_paths; do
+  if test -d $X/bin; then
+    ac_path="$X/bin:$ac_path"
+  fi
   if test -d $X/include; then
-    CFLAGS="$CFLAGS -I$X/include"
-    CPPFLAGS="$CPPFLAGS -I$X/include"
+    for Y in qt qt3; do
+      if test -d $X/include/$Y; then
+        CFLAGS="-I$X/include/$Y $CFLAGS"
+        CPPFLAGS="-I$X/include/$Y $CPPFLAGS"
+        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"
   fi
   if test -d $X/lib64; then
-    LIBS="$LIBS -L$X/lib64"
-    ac_libs="$ac_libs -L$X/lib64"
+    LIBS="-L$X/lib64 $LIBS"
+    ac_libs="-L$X/lib64 $ac_libs"
   fi
   if test -d $X/lib; then
-    LIBS="$LIBS -L$X/lib"
+    LIBS="-L$X/lib $LIBS"
     ac_libs="-L$X/lib $ac_libs"
   fi
 done
 
-# Check for QTDIR environment variable.
-AC_MSG_CHECKING([whether QTDIR environment variable is set])
-if test "x$QTDIR" = "x"; then
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([QTDIR must be properly set.])
-else
-  AC_MSG_RESULT([$QTDIR])
-fi
-
-CFLAGS="$CFLAGS -I$QTDIR/include"
-CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
-if test -d $QTDIR/lib64; then
-  LIBS="$LIBS -L$QTDIR/lib64"
-else
-  LIBS="$LIBS -L$QTDIR/lib"
-fi
-for X in qt qt3; do
-  if test -d $QTDIR/include/$X; then
-    CFLAGS="$CFLAGS -I$QTDIR/include/$X"
-    CPPFLAGS="$CPPFLAGS -I$QTDIR/include/$X"
-  fi
-done
-
 # Checks for Qt library.
 for X in qt-mt qt; do
   if test "x$ac_qtlib" = "x"; then
@@ -125,21 +136,21 @@
 ac_qtdir_errmsg="not found in current PATH. Maybe QT development environment isn't available (qt3-devel)."
 
 # Check for Qt qmake utility.
-AC_PATH_PROG(ac_qmake, qmake, [no], $QTDIR/bin:${PATH})
+AC_PATH_PROG(ac_qmake, qmake, [no], $ac_path)
 if test "x$ac_qmake" = "xno"; then
    AC_MSG_ERROR([qmake $ac_qtdir_errmsg])
 fi
 AC_SUBST(ac_qmake)
 
 # Check for Qt moc utility.
-AC_PATH_PROG(ac_moc, moc, [no], $QTDIR/bin:${PATH})
+AC_PATH_PROG(ac_moc, moc, [no], $ac_path)
 if test "x$ac_moc" = "xno"; then
    AC_MSG_ERROR([moc $ac_qtdir_errmsg])
 fi
 AC_SUBST(ac_moc)
 
 # Check for Qt uic utility.
-AC_PATH_PROG(ac_uic, uic, [no], $QTDIR/bin:${PATH})
+AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
 if test "x$ac_uic" = "xno"; then
    AC_MSG_ERROR([uic $ac_qtdir_errmsg])
 fi
@@ -198,6 +209,42 @@
   AC_DEFINE(CONFIG_MIDI_INSTRUMENT, 1, [Define if MIDI instrument mapping is available.])
 fi
 
+AC_CHECK_LIB(lscp, lscp_create_fxsend, [ac_fxsend="yes"], [ac_fxsend="no"])
+if test "x$ac_fxsend" = "xyes"; then
+  AC_DEFINE(CONFIG_FXSEND, 1, [Define if FX sends is available.])
+  AC_CACHE_CHECK([for FX send level in lscp_fxsend_info_t],
+    ac_fxsend_level, [
+    AC_TRY_COMPILE([#include "lscp/client.h"], [
+	  lscp_fxsend_info_t info;
+	  info.level = 0.0f;
+      ], ac_fxsend_level="yes", ac_fxsend_level="no")
+  ])
+  if test "x$ac_fxsend_level" = "xyes"; then
+	  AC_DEFINE(CONFIG_FXSEND_LEVEL, 1, [Define if FX send level is available.])
+  fi
+fi
+
+AC_CACHE_CHECK([for audio_routing array type],
+  ac_audio_routing, [
+  AC_TRY_COMPILE([#include "lscp/client.h"], [
+    lscp_channel_info_t info;
+    char ch = info.audio_routing[0][0];
+    ], ac_audio_routing="no", ac_audio_routing="yes")
+])
+if test "x$ac_audio_routing" = "xyes"; then
+   AC_DEFINE(CONFIG_AUDIO_ROUTING, 1, [Define if audio_routing is an integer array.])
+fi
+
+AC_CHECK_LIB(lscp, lscp_set_volume, [ac_volume="yes"], [ac_volume="no"])
+if test "x$ac_volume" = "xyes"; then
+  AC_DEFINE(CONFIG_VOLUME, 1, [Define if global volume is available.])
+fi
+
+AC_CHECK_LIB(lscp, lscp_edit_instrument, [ac_edit_instrument="yes"], [ac_edit_instrument="no"])
+if test "x$ac_edit_instrument" = "xyes"; then
+  AC_DEFINE(CONFIG_EDIT_INSTRUMENT, 1, [Define if instrument editing is available.])
+fi
+
 # Check for optional libraries.
 if test "x$ac_libgig" = "xyes"; then
    AC_CHECK_LIB(gig, main, [ac_libgig="yes"], [ac_libgig="no"])