--- qsampler/trunk/configure.ac	2006/01/03 13:51:35	825
+++ qsampler/trunk/configure.ac	2006/12/03 18:26:13	961
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(Qsampler, 0.1.2.16, rncbc@rncbc.org, qsampler)
+AC_INIT(Qsampler, 0.1.3.3, rncbc@rncbc.org, qsampler)
 AC_CONFIG_SRCDIR(src/qsamplerMainForm.ui.h)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES(Makefile qsampler.pro qsampler.spec)
@@ -58,6 +58,10 @@
     CPPFLAGS="$CPPFLAGS -I$X/include"
     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"
+  fi
   if test -d $X/lib; then
     LIBS="$LIBS -L$X/lib"
     ac_libs="-L$X/lib $ac_libs"
@@ -75,7 +79,11 @@
 
 CFLAGS="$CFLAGS -I$QTDIR/include"
 CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
-LIBS="$LIBS -L$QTDIR/lib"
+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"
@@ -185,6 +193,11 @@
    AC_DEFINE(CONFIG_MUTE_SOLO, 1, [Define if mute/solo is available.])
 fi
 
+AC_CHECK_LIB(lscp, lscp_map_midi_instrument, [ac_midi_instrument="yes"], [ac_midi_instrument="no"])
+if test "x$ac_midi_instrument" = "xyes"; then
+  AC_DEFINE(CONFIG_MIDI_INSTRUMENT, 1, [Define if MIDI instrument mapping 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"])