1.1 --- a/configure.in Mon Jun 23 05:03:29 2008 +0000
1.2 +++ b/configure.in Wed Jun 25 10:40:45 2008 +0000
1.3 @@ -185,10 +185,14 @@
1.4 AM_CONDITIONAL( AUDIO_ALSA, [test "$HAVE_ALSA" = 'yes'] )
1.7 -dnl Check for linux cdrom device support
1.8 -AC_CHECK_HEADER([linux/cdrom.h], [HAVE_LINUX_CDROM_H=yes], [
1.9 - echo "Linux CDROM support not found, building without it."] )
1.10 -AM_CONDITIONAL(CDROM_LINUX, [test "$HAVE_LINUX_CDROM_H" = "yes"])
1.11 +dnl Check for native cdrom support. There can be only one.
1.12 +AC_CHECK_HEADER([linux/cdrom.h], [CDROM_DRIVER=linux], [true])
1.13 +dnl AC_CHECK_HEADER([IOKit/IOKitLib.h], [
1.14 +dnl CDROM_DRIVER=osx
1.15 +dnl LIBS="$LIBS -framework IOKit"],[true])
1.16 +AM_CONDITIONAL(CDROM_LINUX, [test "x$CDROM_DRIVER" = "xlinux"])
1.17 +AM_CONDITIONAL(CDROM_OSX, [test "x$CDROM_DRIVER" = "xosx"])
1.18 +AM_CONDITIONAL(CDROM_NONE, [test "x$CDROM_DRIVER" = "x"])
1.20 AC_CHECK_HEADER([linux/joystick.h], [
1.21 HAVE_LINUX_JOYSTICK_H=yes
1.23 echo " Audio drivers: $AUDIO_DRIVERS"
1.26 +if test "x$CDROM_DRIVER" = "x"; then
1.27 + echo " CD-ROM driver: none (no supported cd-rom devices found)"
1.29 + echo " CD-ROM driver: $CDROM_DRIVER"