--- ../mpfc-1.3-org/configure.in	2004-09-13 00:47:15.000000000 +0300
+++ configure.in	2004-09-13 21:05:48.000000000 +0300
@@ -146,19 +146,23 @@
 if test "x$enable_esd" = xyes; then
 	# Check for esound lib
 	LIBS_save=$LIBS
-	AC_CHECK_HEADERS([esd.h],, [AC_MSG_ERROR(*** Can't find esd.h ***)])
-	AC_CHECK_LIB(esd, esd_play_stream,,[AC_MSG_ERROR(*** Can't find libesd ***)])
-	ESD_LIBS=`esd-config --libs`
-	ESD_CFLAGS=`esd-config --cflags`
-	AC_SUBST(ESD_LIBS)
-	AC_SUBST(ESD_CFLAGS)
-	LIBS=$LIBS_save
+	AC_CHECK_HEADERS([esd.h],, [echo "*** Can't find esd. Disabled." ; enable_esd=xo])
+	if test "x$enable_esd" = "xyes" ; then
+		AC_CHECK_LIB(esd, esd_play_stream,,[AC_MSG_ERROR(*** Can't find libesd ***)])
+		ESD_LIBS=`esd-config --libs`
+		ESD_CFLAGS=`esd-config --cflags`
+		AC_SUBST(ESD_LIBS)
+		AC_SUBST(ESD_CFLAGS)
+		LIBS=$LIBS_save
+	fi
 else
 	AC_MSG_RESULT([*** esd plugin disabled per user request ***])
 fi
 
+OUTPUT_PLUGINS="alsa disk_writer esd oss"
+
 # Handle specific plugins choosing
-for class in CHARSET EFFECT INPUT OUTPUT; do
+for class in CHARSET EFFECT INPUT; do
     value=`eval echo "\\$${class}_PLUGINS"`
     if test "x${value}" = x; then
        eval ${class}_PLUGINS="\$\(ALL_PLUGINS\)"
@@ -167,6 +171,11 @@
        eval ${class}_PLUGINS="\${value}"
     fi
 done
+
+if test "x$enable_esd" != "xyes" ; then
+   OUTPUT_PLUGINS="`echo ${OUTPUT_PLUGINS} |sed -e 's/esd/ /'`"
+fi
+
 AC_SUBST(CHARSET_PLUGINS)
 AC_SUBST(EFFECT_PLUGINS)
 AC_SUBST(INPUT_PLUGINS)