--- libs/configure.ac-dist	2002-08-06 11:42:30.000000000 +0200
+++ libs/configure.ac	2002-08-06 11:42:48.000000000 +0200
@@ -3,7 +3,7 @@
 
 AM_BUILD_ENVIRONMENT
 
-AC_CONFIG_SUBDIRS(sigc++ pbd midi++ libxml2 ardour)
+AC_CONFIG_SUBDIRS(libsndfile sigc++ pbd midi++ libxml2 ardour)
 
 if test x$WITH_GTK_GUI != x ; then
    AC_CONFIG_SUBDIRS(gtkmm gtkmmext libart_lgpl gtk-canvas)
--- autogen.sh-dist	2002-08-06 11:43:16.000000000 +0200
+++ autogen.sh	2002-08-06 11:44:34.000000000 +0200
@@ -2,12 +2,13 @@
 
 pwd=`pwd`
 
-base_libs="sigc++ pbd midi++ libxml2 ardour"
+base_libs="libsndfile sigc++ pbd midi++ libxml2 ardour"
 gui_libs="gtkmm gtkmmext libart_lgpl gtk-canvas"
 gui_progs="gtk_ardour"
 nogui_progs="ksi_ardour"
 
 BASE_INCLUDES="\
+-I\$TOP/libs/libsndfile/src \
 -I\$TOP/libs/sigc++ \
 -I\$TOP/libs/sigc++/sigc++/config \
 -I\$TOP/libs/pbd \
@@ -25,6 +26,7 @@
 -I\$TOP/libs/gtkmm"
 
 BASE_LIBS="\
+-L\$TOP/libs/libsndfile/src/.libs \
 \$TOP/libs/midi++/libmidipp.a \
 \$TOP/libs/pbd/libpbd.a \
 \$TOP/libs/sigc++/sigc++/libsigc.a \
--- libs/ardour/configure.ac-dist	2002-08-06 12:00:07.000000000 +0200
+++ libs/ardour/configure.ac	2002-08-06 12:29:19.000000000 +0200
@@ -51,17 +51,13 @@
 dnl AC_PROG_RANLIB
 
 AM_DISABLE_STATIC
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 
 dnl check for the libraries we need
 
 AM_PATH_GLIB(1.0.0, , 
    [ AC_MSG_ERROR([*** ardour requires glib, but it doesn't appear to be installed])])
 
-AC_CHECK_HEADERS(sndfile.h, ,[
-  AC_MSG_ERROR([**** ardour requires libsndfile, but it doesn't appear to be installed])
-])   	
-
 AC_CHECK_HEADERS(gdbm.h, ,[
   AC_MSG_ERROR([**** ardour requires libgdbm, but it doesn't appear to be installed])
 ])