--- configure.in.orig	2010-07-19 01:26:37.542392956 -0400
+++ configure.in	2010-07-19 01:28:05.077400778 -0400
@@ -1641,33 +1641,6 @@
   fi
 ], [$SKIP_CONFIG_DVDCSS])
 
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [
-  if test "$host_vendor" = "apple" ; then
-    ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
-      --extra-cflags="$CFLAGS -fno-common $DVDREAD_CFLAGS -D__DARWIN__ -I`pwd`/../libdvdcss/src" \
-      --enable-static \
-      --disable-shared \
-      --cc="$CC" &&
-    make dvdread-config &&
-    mkdir -p `pwd`/../includes/dvdread
-    cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
-  else
-    ./configure2 \
-      --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \
-      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
-      --host=$host_alias \
-      --build=$build_alias \
-      --enable-static \
-      --disable-shared \
-      --disable-strip \
-      --disable-opts \
-      --cc="$CC" &&
-    make dvdread-config &&
-    mkdir -p `pwd`/../includes/dvdread
-    cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
-  fi
-
-], [0])
 
 XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [
   if test "$host_vendor" = "apple" ; then
@@ -1680,9 +1653,7 @@
       --cc="$CC"
   else
     ./configure2 \
-      --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \
-      --extra-ldflags="-L`pwd`/../libdvdread/obj" \
-      --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+      --extra-cflags="-D_XBMC -fPIC -DPIC" \
       --host=$host_alias \
       --build=$build_alias \
       --enable-static \
--- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.orig	2010-07-19 01:28:37.716268195 -0400
+++ xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in	2010-07-19 01:31:10.453143936 -0400
@@ -2,13 +2,12 @@
 ARCH=@ARCH@
 SYSDIR=../../../../../system/players/dvdplayer
 SOS= libdvdnav-$(ARCH).so
-DIRS=	libdvdread \
-	libdvdnav
+DIRS=	libdvdnav
 
 WRAPPER=../../../DllLoader/exports/wrapper.o
 WRAPPER_OSX=../../../../../tools/Mach5/wrapper.rb
 
-LDFLAGS += -shared -fPIC -rdynamic
+LDFLAGS += -shared -fPIC -rdynamic -ldvdread
 ifeq ($(ARCH), powerpc-osx)
 	# Add -lbundle1.o for powerpc-osx
 	BUNDLE1_O = -lbundle1.o
@@ -41,9 +40,9 @@
 		libdvdcss/src/*.o $(BUNDLE1_O)
 	$(WRAPPER_OSX) $@;mv output.so $@
 
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
 	ld -bundle -flat_namespace -undefined suppress -o $@ \
-		$(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
+		$(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
 	$(WRAPPER_OSX) $@;mv output.so $@
 
 else
@@ -52,8 +52,8 @@
 		libdvdcss/src/*.o \
 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
 
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
-	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
 
 endif