--- gigedit/trunk/configure.ac	2007/05/30 00:14:05	1213
+++ gigedit/trunk/configure.ac	2007/09/04 11:04:56	1322
@@ -26,7 +26,12 @@
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
 
-AC_CONFIG_SRCDIR(src/main.cpp)
+# configure checks for the following file's existence to make sure that
+# the directory that it is told contains the source code in fact does.
+# Occasionally people accidentally specify the wrong directory with
+# `--srcdir'; this is a safety check.
+AC_CONFIG_SRCDIR(src/gigedit/main.cpp)
+
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE
 
@@ -39,7 +44,7 @@
 IT_PROG_INTLTOOL(0.35.0)
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.6.1 gthread-2.0)
+PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.11 gthread-2.0)
 PKG_CHECK_MODULES(GIG, gig >= 3.1.1)
 
 # check for presence of libsndfile
@@ -47,22 +52,49 @@
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
 
+# check for loop functionality in libsndfile
+gigedit_save_CFLAGS=$CFLAGS
+CFLAGS="$SNDFILE_CFLAGS $CFLAGS"
+AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],,
+		 [AC_MSG_WARN([Your version of libsndfile does not support
+    reading of loop information. Gigedit will not be able to
+    extract loop information from sample files.])],
+		 [#include <sndfile.h>])
+CFLAGS=$gigedit_save_CFLAGS
+
 # check for (optional) presence of liblinuxsampler
 liblinuxsampler_version="0.4.0.5cvs"
 PKG_CHECK_MODULES(
     LINUXSAMPLER, linuxsampler >= $liblinuxsampler_version,
     have_linuxsampler=1, have_linuxsampler=0
 )
+LINUXSAMPLER_PLUGIN_DIR=
 if test "$have_linuxsampler" = "0"; then
     echo "Required liblinuxsampler version not found!"
     echo "You need to have liblinuxsampler version ${liblinuxsampler_version}"
     echo "installed. Support for on-the-fly editing with LinuxSampler will"
     echo "be disabled."
 else
-    echo "yes, found linuxsampler $linuxsampler_version"
+    echo "Found linuxsampler $liblinuxsampler_version"
+    echo -n "Retrieving LinuxSampler's plugin dir... "
+    LINUXSAMPLER_PLUGIN_DIR=`pkg-config --variable plugindir linuxsampler`
+    if test "$LINUXSAMPLER_PLUGIN_DIR" = ""; then
+        have_linuxsampler=0
+        echo "Error"
+        echo "Could not retrieve LinuxSampler's plugin directory. Support"
+        echo "for on-the-fly editing with LinuxSampler will be disabled."
+    else
+        echo "${LINUXSAMPLER_PLUGIN_DIR} "
+        # convert absolute LS plugin dir into relative dir
+        # (see ch 27.10 of the automake manual,
+        #  "Installing to Hard-Coded Locations")
+        LINUXSAMPLER_PLUGIN_DIR=`echo "${LINUXSAMPLER_PLUGIN_DIR}" | sed 's/^.*\/lib\//\${libdir}\//g'`
+        echo "Relative plugin dir: ${LINUXSAMPLER_PLUGIN_DIR}"
+    fi
 fi
 AC_SUBST(LINUXSAMPLER_CFLAGS)
 AC_SUBST(LINUXSAMPLER_LIBS)
+AC_SUBST(LINUXSAMPLER_PLUGIN_DIR)
 AM_CONDITIONAL(HAVE_LINUXSAMPLER, test $have_linuxsampler = "1")
 AC_DEFINE_UNQUOTED(
     HAVE_LINUXSAMPLER, $have_linuxsampler,
@@ -72,8 +104,11 @@
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
+	src/gigedit/Makefile
 	src/plugin/Makefile
 	po/Makefile.in
 	debian/Makefile
+        doc/Makefile
+        doc/quickstart/Makefile
 ])
 AC_OUTPUT