1.1 --- a/configure Mon Jun 23 05:03:29 2008 +0000
1.2 +++ b/configure Wed Jun 25 10:40:45 2008 +0000
1.14 @@ -9195,16 +9199,15 @@
1.17 if test $ac_cv_header_linux_cdrom_h = yes; then
1.18 - HAVE_LINUX_CDROM_H=yes
1.21 - echo "Linux CDROM support not found, building without it."
1.27 -if test "$HAVE_LINUX_CDROM_H" = "yes"; then
1.28 + CDROM_DRIVER=linux
1.36 +if test "x$CDROM_DRIVER" = "xlinux"; then
1.38 CDROM_LINUX_FALSE='#'
1.40 @@ -9213,6 +9216,26 @@
1.45 +if test "x$CDROM_DRIVER" = "xosx"; then
1.47 + CDROM_OSX_FALSE='#'
1.49 + CDROM_OSX_TRUE='#'
1.55 +if test "x$CDROM_DRIVER" = "x"; then
1.57 + CDROM_NONE_FALSE='#'
1.59 + CDROM_NONE_TRUE='#'
1.64 if test "${ac_cv_header_linux_joystick_h+set}" = set; then
1.65 { $as_echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
1.66 $as_echo_n "checking for linux/joystick.h... " >&6; }
1.67 @@ -11448,6 +11471,20 @@
1.68 Usually this means the macro was only invoked conditionally." >&2;}
1.69 { (exit 1); exit 1; }; }
1.71 +if test -z "${CDROM_OSX_TRUE}" && test -z "${CDROM_OSX_FALSE}"; then
1.72 + { { $as_echo "$as_me:$LINENO: error: conditional \"CDROM_OSX\" was never defined.
1.73 +Usually this means the macro was only invoked conditionally." >&5
1.74 +$as_echo "$as_me: error: conditional \"CDROM_OSX\" was never defined.
1.75 +Usually this means the macro was only invoked conditionally." >&2;}
1.76 + { (exit 1); exit 1; }; }
1.78 +if test -z "${CDROM_NONE_TRUE}" && test -z "${CDROM_NONE_FALSE}"; then
1.79 + { { $as_echo "$as_me:$LINENO: error: conditional \"CDROM_NONE\" was never defined.
1.80 +Usually this means the macro was only invoked conditionally." >&5
1.81 +$as_echo "$as_me: error: conditional \"CDROM_NONE\" was never defined.
1.82 +Usually this means the macro was only invoked conditionally." >&2;}
1.83 + { (exit 1); exit 1; }; }
1.85 if test -z "${JOY_LINUX_TRUE}" && test -z "${JOY_LINUX_FALSE}"; then
1.86 { { $as_echo "$as_me:$LINENO: error: conditional \"JOY_LINUX\" was never defined.
1.87 Usually this means the macro was only invoked conditionally." >&5
1.88 @@ -12821,3 +12858,8 @@
1.89 echo " Audio drivers: $AUDIO_DRIVERS"
1.92 +if test "x$CDROM_DRIVER" = "x"; then
1.93 + echo " CD-ROM driver: none (no supported cd-rom devices found)"
1.95 + echo " CD-ROM driver: $CDROM_DRIVER"