- there are three different actions related to cdrom. One for --enable-cdrom,

one for --disable-cdrom, and one for the defalt if it's not specified.  The
  enabled action and default are supposed to be the same, but they were
  slightly different, and Bochs on BeOS was able to compile with --enable-cdrom
  but not with the default action.  Solution: now the autoconf actions only
  sets bx_cdrom=0 or bx_cdrom=1.  Then afterward, it tests $bx_cdrom and does
  the enable or disable action.  This will be easier to maintain because there
  is just one copy of each action, instead of two copies that are supposed to
  be kept identical to each other.

bochs/configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.153 2002/10/24 21:04:27 bdenney Exp .
+# From configure.in Id: configure.in,v 1.154 2002/10/26 13:14:04 bdenney Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -19967,14 +19967,16 @@ echo $ECHO_N "checking for CDROM support... $ECHO_C" >&6
 if test "${enable_cdrom+set}" = set; then
   enableval="$enable_cdrom"
   if test "$enableval" = no; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    CDROM_OBJS=''
-    cat >>confdefs.h <<\_ACEOF
-#define BX_SUPPORT_CDROM 0
-_ACEOF
-
+     bx_cdrom=0
    else
+     bx_cdom=1
+   fi
+else
+   bx_cdrom=1
+
+fi;
+
+if test "$bx_cdrom" = 1; then
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
     CDROM_OBJS='cdrom.o'
@@ -19997,32 +19999,15 @@ echo "${ECHO_T}Using OSX IOKit CD Interface" >&6
 #define BX_SUPPORT_CDROM 1
 _ACEOF
 
-   fi
 else
-
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-    CDROM_OBJS='cdrom.o'
-    if test "$with_amigaos" = yes; then
-      # use the amiga cdrom file instead.
-      CDROM_OBJS="cdrom_amigaos.o"
-    elif test "$can_use_osx_cdrom" = yes; then
-      # use cdrom_osx
-      echo "$as_me:$LINENO: result: Using OSX IOKit CD Interface" >&5
-echo "${ECHO_T}Using OSX IOKit CD Interface" >&6
-      CDROM_OBJS="cdrom_osx.o"
-      EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation"
-    elif test "$with_beos" = yes; then
-      # use the beos cdrom file instead
-      CDROM_OBJS="$CDROM_OBJS cdrom_beos.o"
-    fi
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    CDROM_OBJS=''
     cat >>confdefs.h <<\_ACEOF
-#define BX_SUPPORT_CDROM 1
+#define BX_SUPPORT_CDROM 0
 _ACEOF
 
-
-
-fi;
+fi
 
 
 

bochs/configure.in

@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.154 2002-10-26 13:14:04 bdenney Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.155 2002-10-26 21:51:19 bdenney Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -1350,10 +1350,14 @@ AC_MSG_CHECKING(for CDROM support)
 AC_ARG_ENABLE(cdrom,
   [  --enable-cdrom                    CDROM support],
   [if test "$enableval" = no; then
-    AC_MSG_RESULT(no)
-    CDROM_OBJS=''
-    AC_DEFINE(BX_SUPPORT_CDROM, 0)
+     bx_cdrom=0
    else
+     bx_cdom=1
+   fi],
+  [ bx_cdrom=1 ]
+  )
+
+if test "$bx_cdrom" = 1; then
     AC_MSG_RESULT(yes)
     CDROM_OBJS='cdrom.o'
     if test "$can_compile_amigaos" = yes; then
@@ -1371,25 +1375,11 @@ AC_ARG_ENABLE(cdrom,
 	CDROM_OBJS="$CDROM_OBJS cdrom_beos.o"
     esac
     AC_DEFINE(BX_SUPPORT_CDROM, 1)
-   fi],
-  [
-    AC_MSG_RESULT(yes)
-    CDROM_OBJS='cdrom.o'
-    if test "$with_amigaos" = yes; then
-      # use the amiga cdrom file instead.
-      CDROM_OBJS="cdrom_amigaos.o"
-    elif test "$can_use_osx_cdrom" = yes; then
-      # use cdrom_osx
-      AC_MSG_RESULT(Using OSX IOKit CD Interface)	
-      CDROM_OBJS="cdrom_osx.o"
-      EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation"
-    elif test "$with_beos" = yes; then
-      # use the beos cdrom file instead
-      CDROM_OBJS="$CDROM_OBJS cdrom_beos.o"
-    fi
-    AC_DEFINE(BX_SUPPORT_CDROM, 1)
-    ]
-  )
+else
+    AC_MSG_RESULT(no)
+    CDROM_OBJS=''
+    AC_DEFINE(BX_SUPPORT_CDROM, 0)
+fi
 
 AC_SUBST(CDROM_OBJS)