--- gnome-cd/Makefile.in.orig	Sat Mar 12 02:52:17 2005
+++ gnome-cd/Makefile.in	Sat Mar 12 03:03:20 2005
@@ -282,8 +282,8 @@
 libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED)
 @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h
 
-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h
+#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
+@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h
 @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h
 
 bin_PROGRAMS = gnome-cd
@@ -352,13 +352,13 @@
 	solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \
 	linux-cdrom.c linux-cdrom.h preferences.c preferences.h \
 	cd-selection.c cd-selection.h theme.c
-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@	bsd-cdrom.$(OBJEXT)
+@CDROM_HOST_BSD_TRUE@am__objects_2 = \
+@CDROM_HOST_BSD_TRUE@	bsd-cdrom.$(OBJEXT)
 @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
 @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@	linux-cdrom.$(OBJEXT)
 @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
 @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@	solaris-cdrom.$(OBJEXT)
-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
+#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
 am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \
 	callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \
 	display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \