- the name of the object file for the lowlevel sound support is now stored in

SOUNDLOW_OBJS. The value of SB16_OBJS is now 'sb16.o' if SB16 support is
  enabled. These changes are necessary before converting the SB16 to a plugin.

bochs/configure

@@ -20076,6 +20076,7 @@ if test "${enable_sb16+set}" = set; then
      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
      SB16_OBJS=''
+     SOUNDLOW_OBJS=''
      cat >>confdefs.h <<\_ACEOF
 #define BX_SUPPORT_SB16 0
 _ACEOF
@@ -20083,7 +20084,7 @@ _ACEOF
    else
      case "$enableval" in
        dummy)
-         SB16_OBJS='$(SB16_DUMMY_OBJS)'
+         SOUNDLOW_OBJS=''
          cat >>confdefs.h <<\_ACEOF
 #define BX_SOUND_OUTPUT_C bx_sound_output_c
 _ACEOF
@@ -20092,7 +20093,7 @@ _ACEOF
 echo "${ECHO_T}dummy" >&6
          ;;
        freebsd|linux)
-         SB16_OBJS='$(SB16_LINUX_OBJS)'
+         SOUNDLOW_OBJS='soundlnx.o'
          cat >>confdefs.h <<\_ACEOF
 #define BX_SOUND_OUTPUT_C bx_sound_linux_c
 _ACEOF
@@ -20101,7 +20102,7 @@ _ACEOF
 echo "${ECHO_T}linux" >&6
          ;;
        win)
-         SB16_OBJS='$(SB16_WIN_OBJS)'
+         SOUNDLOW_OBJS='soundwin.o'
          cat >>confdefs.h <<\_ACEOF
 #define BX_SOUND_OUTPUT_C bx_sound_windows_c
 _ACEOF
@@ -20116,6 +20117,7 @@ echo "${ECHO_T}win" >&6
          echo "You must pass one of dummy, linux, win, freebsd to --enable-sb16"
          exit 1 ;;
      esac
+     SB16_OBJS='sb16.o'
      cat >>confdefs.h <<\_ACEOF
 #define BX_SUPPORT_SB16 1
 _ACEOF
@@ -20126,6 +20128,7 @@ else
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
     SB16_OBJS=''
+    SOUNDLOW_OBJS=''
     cat >>confdefs.h <<\_ACEOF
 #define BX_SUPPORT_SB16 0
 _ACEOF
@@ -22430,6 +22433,7 @@ s,@FPU_VAR@,$FPU_VAR,;t t
 s,@FPU_GLUE_OBJ@,$FPU_GLUE_OBJ,;t t
 s,@CDROM_OBJS@,$CDROM_OBJS,;t t
 s,@SB16_OBJS@,$SB16_OBJS,;t t
+s,@SOUNDLOW_OBJS@,$SOUNDLOW_OBJS,;t t
 s,@GDBSTUB_VAR@,$GDBSTUB_VAR,;t t
 s,@IODEBUG_OBJS@,$IODEBUG_OBJS,;t t
 s,@IODEV_LIB_VAR@,$IODEV_LIB_VAR,;t t

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.161 2002-11-09 14:12:09 cbothamy Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.162 2002-11-12 21:07:16 vruppert Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -1391,21 +1391,22 @@ AC_ARG_ENABLE(sb16,
   [if test "$enableval" = no; then
      AC_MSG_RESULT(no)
      SB16_OBJS=''
+     SOUNDLOW_OBJS=''
      AC_DEFINE(BX_SUPPORT_SB16, 0)
    else
      case "$enableval" in
        dummy)
-         SB16_OBJS='$(SB16_DUMMY_OBJS)'
+         SOUNDLOW_OBJS=''
          AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_output_c)
          AC_MSG_RESULT(dummy)
          ;;
        freebsd|linux)
-         SB16_OBJS='$(SB16_LINUX_OBJS)'
+         SOUNDLOW_OBJS='soundlnx.o'
          AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_linux_c)
          AC_MSG_RESULT(linux)
          ;;
        win)
-         SB16_OBJS='$(SB16_WIN_OBJS)'
+         SOUNDLOW_OBJS='soundwin.o'
          AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_windows_c)
          AC_MSG_RESULT(win)
 		 DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS -lwinmm"
@@ -1416,16 +1417,19 @@ AC_ARG_ENABLE(sb16,
          echo "You must pass one of dummy, linux, win, freebsd to --enable-sb16"
          exit 1 ;;
      esac
+     SB16_OBJS='sb16.o'
      AC_DEFINE(BX_SUPPORT_SB16, 1)
    fi],
 
   [
     AC_MSG_RESULT(no)
     SB16_OBJS=''
+    SOUNDLOW_OBJS=''
     AC_DEFINE(BX_SUPPORT_SB16, 0)
     ]
   )
 AC_SUBST(SB16_OBJS)
+AC_SUBST(SOUNDLOW_OBJS)
 
 
 AC_MSG_CHECKING(for gdb stub enable)

bochs/iodev/Makefile.in

@@ -60,9 +60,6 @@ IOAPIC_OBJS = @IOAPIC_OBJS@
 BX_INCDIRS = -I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
 LOCAL_CXXFLAGS = $(MCH_CFLAGS)
 
-SB16_DUMMY_OBJS = sb16.o
-SB16_LINUX_OBJS = sb16.o soundlnx.o
-SB16_WIN_OBJS   = sb16.o soundwin.o
 SLOWDOWN_OBJS = slowdown_timer.o
 
 OBJS_THAT_CANNOT_BE_PLUGINS = \
@@ -70,7 +67,7 @@ OBJS_THAT_CANNOT_BE_PLUGINS = \
   pit.o pit82c54.o pit_wrap.o \
   @IODEBUG_OBJS@ \
   @NE2K_OBJS@ \
-  @SB16_OBJS@ \
+  @SB16_OBJS@ @SOUNDLOW_OBJS@ \
   @SLOWDOWN_OBJS@ \
   $(MCH_OBJS) \
   $(IOAPIC_OBJS)