diff --git a/configure.in b/configure.in index cfe352dfc..7efd83bac 100644 --- a/configure.in +++ b/configure.in @@ -744,10 +744,6 @@ AC_ARG_ENABLE(sound, [ --disable-sound disable sound outright], ) -AC_ARG_ENABLE(soundmodules, -[ --enable-soundmodules enable modular sound drivers], -) - SNDTYPE="" SOUND_LIBS="" SOUND_CFLAGS="" @@ -868,11 +864,6 @@ QF_maGiC_VALUE SOUND_LIBS="-lwinmm") fi -if test "x$enable_soundmodules" = "xyes"; then - SNDTYPE="modules" - SOUND_LIBS="" -fi - if test "x$enable_sound" = "xno"; then SNDTYPE="" SOUND_LIBS="" @@ -894,8 +885,7 @@ AM_CONDITIONAL(SNDTYPE_SDL, test "$SNDTYPE" = "SDL") AM_CONDITIONAL(SNDTYPE_SGI, test "$SNDTYPE" = "SGI") AM_CONDITIONAL(SNDTYPE_SUN, test "$SNDTYPE" = "SUN") AM_CONDITIONAL(SNDTYPE_WIN32, test "$SNDTYPE" = "WIN32") -AM_CONDITIONAL(SNDTYPE_MODULES, test "$SNDTYPE" = "MODULES") -AM_CONDITIONAL(SNDTYPE_NULL, test "$SNDTYPE" != "ALSA_0_5" -a "$SNDTYPE" != "ALSA_0_9" -a "$SNDTYPE" != "MME" -a "$SNDTYPE" != "OSS" -a "$SNDTYPE" != "SDL" -a "$SNDTYPE" != "SGI" -a "$SNDTYPE" != "SUN" -a "$SNDTYPE" != "WIN32" -a "$SNDTYPE" != "MODULES") +AM_CONDITIONAL(SNDTYPE_NULL, test "$SNDTYPE" != "ALSA_0_5" -a "$SNDTYPE" != "ALSA_0_9" -a "$SNDTYPE" != "MME" -a "$SNDTYPE" != "OSS" -a "$SNDTYPE" != "SDL" -a "$SNDTYPE" != "SGI" -a "$SNDTYPE" != "SUN" -a "$SNDTYPE" != "WIN32") dnl Tests for joystick support AC_MSG_CHECKING(for joystick support)