--- a/configure.in	Sat Sep 05 09:03:35 2009 +0000
+++ b/configure.in	Sat Sep 05 09:11:03 2009 +0000
@@ -206,7 +206,6 @@
 # Standard C sources
 SOURCES="$SOURCES $srcdir/src/*.c"
 SOURCES="$SOURCES $srcdir/src/audio/*.c"
-SOURCES="$SOURCES $srcdir/src/cdrom/*.c"
 SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c"
 SOURCES="$SOURCES $srcdir/src/events/*.c"
 SOURCES="$SOURCES $srcdir/src/file/*.c"
@@ -265,12 +264,6 @@
 else
     SOURCES="$SOURCES $srcdir/src/power/*.c"
 fi
-AC_ARG_ENABLE(cdrom,
-AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
-              , enable_cdrom=yes)
-if test x$enable_cdrom != xyes; then
-    AC_DEFINE(SDL_CDROM_DISABLED)
-fi
 AC_ARG_ENABLE(threads,
 AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]),
               , enable_threads=yes)
@@ -2481,41 +2474,6 @@
                ;;
              esac
         fi
-        # Set up files for the cdrom library
-        if test x$enable_cdrom = xyes; then
-          case $ARCH in
-            linux|solaris)
-                AC_DEFINE(SDL_CDROM_LINUX)
-                SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c"
-                have_cdrom=yes
-            ;;
-            *freebsd*)
-                AC_DEFINE(SDL_CDROM_FREEBSD)
-                SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c"
-                have_cdrom=yes
-            ;;
-            *openbsd*|*netbsd*)
-                AC_DEFINE(SDL_CDROM_OPENBSD)
-                SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c"
-                have_cdrom=yes
-            ;;
-            bsdi)
-                AC_DEFINE(SDL_CDROM_BSDI)
-                SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c"
-                have_cdrom=yes
-            ;;
-            aix)
-                AC_DEFINE(SDL_CDROM_AIX)
-                SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c"
-                have_cdrom=yes
-            ;;
-            osf)
-                AC_DEFINE(SDL_CDROM_OSF)
-                SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
-                have_cdrom=yes
-            ;;
-          esac
-        fi
         # Set up files for the thread library
         if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
             AC_DEFINE(SDL_THREAD_SPROC)
@@ -2560,12 +2518,6 @@
             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
             have_audio=yes
         fi
-        # Set up files for the cdrom library
-        if test x$enable_cdrom = xyes; then
-            AC_DEFINE(SDL_CDROM_QNX)
-            SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c"
-            have_cdrom=yes
-        fi
         # Set up files for the timer library
         if test x$enable_timers = xyes; then
             AC_DEFINE(SDL_TIMER_UNIX)
@@ -2743,12 +2695,6 @@
             SOURCES="$SOURCES $srcdir/src/power/windows/SDL_syspower.c"
             have_power=yes
         fi
-        # Set up files for the cdrom library
-        if test x$enable_cdrom = xyes; then
-            AC_DEFINE(SDL_CDROM_WIN32)
-            SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c"
-            have_cdrom=yes
-        fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
             AC_DEFINE(SDL_THREAD_WIN32)
@@ -2801,12 +2747,6 @@
             SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
             have_joystick=yes
         fi
-        # Set up files for the cdrom library
-        if test x$enable_cdrom = xyes; then
-            AC_DEFINE(SDL_CDROM_BEOS)
-            SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc"
-            have_cdrom=yes
-        fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
             AC_DEFINE(SDL_THREAD_BEOS)
@@ -2910,12 +2850,6 @@
             SOURCES="$SOURCES $srcdir/src/power/macosx/*.c"
             have_power=yes
         fi
-        # Set up files for the cdrom library
-        if test x$enable_cdrom = xyes; then
-            AC_DEFINE(SDL_CDROM_MACOSX)
-            SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c"
-            have_cdrom=yes
-        fi
         # Set up files for the timer library
         if test x$enable_timers = xyes; then
             AC_DEFINE(SDL_TIMER_UNIX)
@@ -2929,7 +2863,7 @@
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
         # If either the audio or CD driver is used, add the AudioUnit framework
-        if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
+        if test x$enable_audio = xyes; then
             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
         fi
         ;;
@@ -2959,12 +2893,6 @@
             SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c"
             have_joystick=yes
         fi
-        # Set up files for the cdrom library
-        if test x$enable_cdrom = xyes; then
-            AC_DEFINE(SDL_CDROM_MINT)
-            SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c"
-            have_cdrom=yes
-        fi
         # Set up files for the timer library
         if test x$enable_timers = xyes; then
             if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -3025,12 +2953,6 @@
     fi
     SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
 fi
-if test x$have_cdrom != xyes; then
-    if test x$enable_cdrom = xyes; then
-        AC_DEFINE(SDL_CDROM_DISABLED)
-    fi
-    SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c"
-fi
 if test x$have_threads != xyes; then
     if test x$enable_threads = xyes; then
         AC_DEFINE(SDL_THREADS_DISABLED)