diff -NurdB libgnomeui-2.10.1/configure.in libgnomeui-2.10.1-patched/configure.in
--- libgnomeui-2.10.1/configure.in	2005-07-04 08:24:56.000000000 -0500
+++ libgnomeui-2.10.1-patched/configure.in	2005-07-19 04:35:38.000000000 -0500
@@ -17,8 +17,6 @@
 m4_define([libgnomeui_extraversion], [])
 
 dnl Required versions of other packages
-m4_define([esound_required_version],         [0.2.26])
-m4_define([audiofile_required_version],      [0.2.3])
 m4_define([libgnome_required_version],       [2.0.0])
 m4_define([libgnomecanvas_required_version], [2.0.0])
 m4_define([libbonoboui_required_version],    [2.0.0])
@@ -110,39 +108,27 @@
 dnl Start of pkg-config checks
 dnl
 
-dnl We first check for esound and audiofile (which has conditional
-dnl support built in)
-dnl
-SOUND_MODULES="esound >= esound_required_version dnl
-  audiofile >= audiofile_required_version"
-PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES], [
-	AC_DEFINE(HAVE_LIBAUDIOFILE, 1,
-                  [Define to 1 if you have libaudiofile installed])
-	AC_DEFINE(HAVE_ESD, 1,
-                  [Define to 1 if you have libesd installed])
-	esd_msg=yes
-],[
-	SOUND_MODULES=""
-	esd_msg=no
-])
-
 dnl
 dnl libjpeg
 dnl
-  if test -z "$LIBJPEG"; then
-    AC_CHECK_LIB(jpeg, jpeg_start_decompress,
-      [AC_CHECK_HEADER(jpeglib.h,
-        jpeg_ok=yes,
-        jpeg_ok=no)],
-      AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
-    if test "$jpeg_ok" = yes; then
-      JPEG='jpeg'; LIBJPEG='-ljpeg'
-      AC_DEFINE(HAVE_LIBJPEG, 1,
-                [Define to 1 if you have libjpeg installed])
-    else
-     AC_MSG_WARN(*** JPEG thumbnail loader will not be built (jpeg header file not found) ***)
-    fi
-  fi
+
+AC_ARG_WITH(libjpeg,  [  --without-libjpeg       build without JPEG support])
+if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
+	AC_CHECK_LIB(jpeg, jpeg_start_decompress,
+		[AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)],
+		AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
+	if test "$jpeg_ok" = yes; then
+		JPEG='jpeg'; LIBJPEG='-ljpeg'
+		AC_DEFINE(HAVE_LIBJPEG, 1, [Define to 1 if you have libjpeg installed])
+	fi
+fi
+
+if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
+	AC_MSG_ERROR([
+*** Checks for JPEG library failed. You can build without it by passing 
+*** --without-libjpeg to configure but the JPEG thumbnail loader will not
+*** be built then.])
+fi
 
 AC_SUBST(LIBJPEG)
 
@@ -264,6 +250,5 @@
 
 AC_OUTPUT
 echo "configuration:
-	esd support: ${esd_msg}
 	doc build:   ${enable_gtk_doc}
 "
diff -NurdB libgnomeui-2.10.1/libgnomeui/gnome-ui-init.c libgnomeui-2.10.1-patched/libgnomeui/gnome-ui-init.c
--- libgnomeui-2.10.1/libgnomeui/gnome-ui-init.c	2005-06-30 10:42:22.000000000 -0500
+++ libgnomeui-2.10.1-patched/libgnomeui/gnome-ui-init.c	2005-07-19 04:02:19.000000000 -0500
@@ -94,8 +94,6 @@
 /* Prototype for a private gnome_stock function */
 void _gnome_stock_icons_init (void);
 
-#ifdef HAVE_ESD
-
 /* Whether to make noises when the user clicks a button, etc.  We cache it
  * in a boolean rather than querying GConf every time.
  */
@@ -104,8 +102,6 @@
 /* GConf client for monitoring the event sounds option */
 static GConfClient *gconf_client = NULL;
 
-#endif /* HAVE_ESD */
-
 
 enum { ARG_DISABLE_CRASH_DIALOG=1, ARG_DISPLAY };
 
@@ -293,7 +289,6 @@
                 libgnomeui_segv_setup (app, FALSE);
 }
 
-#ifdef HAVE_ESD
 static gboolean
 relay_gnome_signal (GSignalInvocationHint *hint,
               	     guint n_param_values,
@@ -498,12 +493,10 @@
 
         use_event_sounds = new_use_event_sounds;
 }
-#endif
 
 static void
 setup_event_listener (void)
 {
-#ifdef HAVE_ESD
         gconf_client = gconf_client_get_default ();
         if (!gconf_client)
                 return;
@@ -525,7 +518,6 @@
                 initialize_gtk_signal_relay ();
                 initialize_gnome_signal_relay ();
 	 }
-#endif
 }
 
 static void