--- festival/speech_tools/config/config.in.orig	2007-03-13 15:07:59.000000000 -0400
+++ festival/speech_tools/config/config.in	2007-03-13 15:08:10.000000000 -0400
@@ -80,7 +80,7 @@
 # INCLUDE_MODULES += NAS_AUDIO
 
 ## Elightenment Sound Demon, for KDE etc.
-# INCLUDE_MODULES += ESD_AUDIO
+INCLUDE_MODULES += ESD_AUDIO
 
 ## Native audio for your platform (sun, linux, freebsd, irix, macosx, windows)
 INCLUDE_MODULES += NATIVE_AUDIO
--- festival/speech_tools/config/modules/esd_audio.mak.orig	2007-03-13 15:46:20.000000000 -0400
+++ festival/speech_tools/config/modules/esd_audio.mak	2007-03-13 15:46:41.000000000 -0400
@@ -45,6 +45,5 @@
 AUDIO_DEFINES += -DSUPPORT_ESD
 AUDIO_INCLUDES += -I$(ESD_INCLUDE)
 MODULE_LIBS += -L$(ESD_LIB) -lesd -laudiofile
-MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt
 
 
--- festival/lib/init.scm.orig	2007-03-13 16:09:39.000000000 -0400
+++ festival/lib/init.scm	2007-03-13 16:10:13.000000000 -0400
@@ -77,14 +77,14 @@
 (cond
  ((member 'nas *modules*)
   (Parameter.def 'Audio_Method 'netaudio))
- ((member 'esd *modules*)
-  (Parameter.def 'Audio_Method 'esdaudio))
  ((member 'sun16audio *modules*)
   (Parameter.def 'Audio_Method 'sun16audio))
  ((member 'freebsd16audio *modules*)
   (Parameter.def 'Audio_Method 'freebsd16audio))
  ((member 'linux16audio *modules*)
   (Parameter.def 'Audio_Method 'linux16audio))
+ ((member 'esd *modules*)
+  (Parameter.def 'Audio_Method 'esdaudio))
  ((member 'irixaudio *modules*)
   (Parameter.def 'Audio_Method 'irixaudio))
  ((member 'macosxaudio *modules*)