--- gigedit/trunk/configure.ac	2007/05/30 00:14:05	1213
+++ gigedit/trunk/configure.ac	2007/06/16 11:28:29	1236
@@ -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
 
@@ -53,16 +58,28 @@
     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} "
+    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 +89,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