diff -urN -Xfreeciv/diff_ignore freeciv/Makefile.am freeciv-nosound/Makefile.am
--- freeciv/Makefile.am	Sat May 18 08:31:56 2002
+++ freeciv-nosound/Makefile.am	Tue Jun 11 18:40:13 2002
@@ -82,6 +82,7 @@
 		m4/progtest.m4			\
 		m4/readline.m4			\
 		m4/sdl.m4			\
+		m4/sound.m4			\
 		m4/vsnprintf.m4			\
 		m4/x.213			\
 		m4/x.252			\
diff -urN -Xfreeciv/diff_ignore freeciv/client/audio.c freeciv-nosound/client/audio.c
--- freeciv/client/audio.c	Sat May 25 08:29:45 2002
+++ freeciv-nosound/client/audio.c	Tue Jun 11 18:28:21 2002
@@ -87,12 +87,12 @@
   }
 
   if (!plugins[i].init()) {
-    freelog(LOG_ERROR, _("Plugin found but can't be initialized."));
+    freelog(LOG_ERROR, _("Plugin %s found but can't be initialized."), name);
     return FALSE;
   }
 
   selected_plugin = i;
-  freelog(LOG_NORMAL, _("Plugin '%s' is now selected"),
+  freelog(LOG_VERBOSE, _("Plugin '%s' is now selected"),
 	  plugins[selected_plugin].name);
   return TRUE;
 }
@@ -127,6 +127,11 @@
   char *filename, *file_capstr;
   char us_capstr[] = "+soundspec";
 
+  if (num_plugins_used == 1) {
+    /* We only have the dummy plugin, so silenty skip the below */
+    tagfile = NULL;
+    return;
+  }
   if (!spec_name) {
     freelog(LOG_FATAL, _("No audio ruleset given!"));
     exit(EXIT_FAILURE);
diff -urN -Xfreeciv/diff_ignore freeciv/configure.ac freeciv-nosound/configure.ac
--- freeciv/configure.ac	Mon Jun 10 08:30:41 2002
+++ freeciv-nosound/configure.ac	Tue Jun 11 18:20:22 2002
@@ -489,44 +489,8 @@
     AC_MSG_ERROR(could not guess which client to compile)
   fi
 
-  dnl Add esound support to client
-  ESD_VERSION=0.0.20
-  AM_PATH_ESD($ESD_VERSION, :, ESD=no)
-  if test "x$ESD" != "xno"; then
-     SOUND_CFLAGS="$SOUND_CFLAGS $ESD_CFLAGS"
-     SOUND_LIBS="$SOUND_LIBS $ESD_LIBS"
-     AC_DEFINE(ESD, 1, [Esound support])
-     AC_MSG_CHECKING(building ESOUND support)
-     AC_MSG_RESULT(yes)
-  fi
-
-  dnl Add SDL support to client
-  SDL_VERSION=1.0.0
-  AM_PATH_SDL($SDL_VERSION, :, SDL = no)
-  if test "x$SDL" != "xno"; then
-    AC_CHECK_HEADER(SDL/SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
-    AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, SDL_mixer=yes)
-    AC_MSG_CHECKING(building SDL_mixer support)
-    if test "x$SDL_mixer_h" = "x1"; then
-      if test "x$SDL_mixer" = "xyes"; then
-        SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
-        SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
-        AC_DEFINE(SDL, 1, [SDL_Mixer support])
-        AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT([no, found header but not library!])
-      fi
-    else
-      AC_MSG_RESULT([no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html])
-    fi
-  fi
-
-  dnl Add WinMM sound support to client
-  if test x"$MINGW32" = "xyes"; then
-    SOUND_LIBS="$SOUND_LIBS -lwinmm"
-    AC_DEFINE(WINMM, 1, [Windows MultiMedia sound support])
-    WINMM="yes"
-  fi
+  dnl Check for sound support, sets SOUND_CFLAGS, SOUND_LIBS, ESD, SDL & WINMM
+  FC_CHECK_SOUND()
 
   gui_sources="gui-$client"
 fi
@@ -535,9 +499,9 @@
 AC_SUBST(CLIENT_LIBS)
 AC_SUBST(SOUND_CFLAGS)
 AC_SUBST(SOUND_LIBS)
-AM_CONDITIONAL(ESD, test "$ESD" != "no")
-AM_CONDITIONAL(SDL, test "$SDL_mixer" = "yes")
-AM_CONDITIONAL(WINMM, test "$WINMM" = "yes")
+AM_CONDITIONAL(ESD, test "x$ESD" = "xyes")
+AM_CONDITIONAL(SDL, test "x$SDL_mixer" = "xyes")
+AM_CONDITIONAL(WINMM, test "x$WINMM" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_GTK, test "$gui_sources" = "gui-gtk")
 AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
 AM_CONDITIONAL(CLIENT_GUI_XAW, test "$gui_sources" = "gui-xaw")
diff -urN -Xfreeciv/diff_ignore freeciv/configure.in freeciv-nosound/configure.in
--- freeciv/configure.in	Mon Jun 10 08:30:41 2002
+++ freeciv-nosound/configure.in	Tue Jun 11 18:20:22 2002
@@ -483,44 +483,8 @@
     AC_MSG_ERROR(could not guess which client to compile)
   fi
 
-  dnl Add esound support to client
-  ESD_VERSION=0.0.20
-  AM_PATH_ESD($ESD_VERSION, :, ESD=no)
-  if test "x$ESD" != "xno"; then
-     SOUND_CFLAGS="$SOUND_CFLAGS $ESD_CFLAGS"
-     SOUND_LIBS="$SOUND_LIBS $ESD_LIBS"
-     AC_DEFINE(ESD)
-     AC_MSG_CHECKING(building ESOUND support)
-     AC_MSG_RESULT(yes)
-  fi
-
-  dnl Add SDL support to client
-  SDL_VERSION=1.0.0
-  AM_PATH_SDL($SDL_VERSION, :, SDL = no)
-  if test "x$SDL" != "xno"; then
-    AC_CHECK_HEADER(SDL/SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
-    AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, SDL_mixer=yes)
-    AC_MSG_CHECKING(building SDL_mixer support)
-    if test "x$SDL_mixer_h" = "x1"; then
-      if test "x$SDL_mixer" = "xyes"; then
-        SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
-        SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
-        AC_DEFINE(SDL)
-        AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT([no, found header but not library!])
-      fi
-    else
-      AC_MSG_RESULT([no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html])
-    fi
-  fi
-  
-  dnl Add WinMM sound support to client
-  if test x"$MINGW32" = "xyes"; then
-    SOUND_LIBS="$SOUND_LIBS -lwinmm"
-    AC_DEFINE(WINMM)    
-    WINMM="yes"
-  fi
+  dnl Check for sound support, sets SOUND_CFLAGS, SOUND_LIBS, ESD, SDL & WINMM
+  FC_CHECK_SOUND()
 
   gui_sources="gui-$client"
 fi
@@ -529,9 +493,9 @@
 AC_SUBST(CLIENT_LIBS)
 AC_SUBST(SOUND_CFLAGS)
 AC_SUBST(SOUND_LIBS)
-AM_CONDITIONAL(ESD, test "$ESD" != "no")
-AM_CONDITIONAL(SDL, test "$SDL_mixer" = "yes")
-AM_CONDITIONAL(WINMM, test "$WINMM" = "yes")
+AM_CONDITIONAL(ESD, test x"$ESD" = "xyes")
+AM_CONDITIONAL(SDL, test x"$SDL_mixer" = "xyes")
+AM_CONDITIONAL(WINMM, test x"$WINMM" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_GTK, test "$gui_sources" = "gui-gtk")
 AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
 AM_CONDITIONAL(CLIENT_GUI_XAW, test "$gui_sources" = "gui-xaw")
diff -urN -Xfreeciv/diff_ignore freeciv/m4/sound.m4 freeciv-nosound/m4/sound.m4
--- freeciv/m4/sound.m4	Thu Jan  1 01:00:00 1970
+++ freeciv-nosound/m4/sound.m4	Tue Jun 11 18:20:22 2002
@@ -0,0 +1,47 @@
+AC_DEFUN(FC_CHECK_SOUND,[
+ AC_ARG_ENABLE(sound,
+   [  --disable-sound         Do not use sound support],
+   USE_SOUND=$enableval, USE_SOUND=yes)
+
+ if test "x$USE_SOUND" = "xyes"; then
+
+  dnl Add esound support to client
+  ESD_VERSION=0.0.20
+  AM_PATH_ESD($ESD_VERSION, ESD=yes, ESD=no)
+  if test "x$ESD" != "xno"; then
+     SOUND_CFLAGS="$SOUND_CFLAGS $ESD_CFLAGS"
+     SOUND_LIBS="$SOUND_LIBS $ESD_LIBS"
+     AC_DEFINE(ESD, 1, [Esound support])
+     AC_MSG_CHECKING(building ESOUND support)
+     AC_MSG_RESULT(yes)
+  fi
+
+  dnl Add SDL support to client
+  SDL_VERSION=1.0.0
+  AM_PATH_SDL($SDL_VERSION, SDL=yes, SDL=no)
+  if test "x$SDL" != "xno"; then
+    AC_CHECK_HEADER(SDL/SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
+    AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, SDL_mixer=yes)
+    AC_MSG_CHECKING(building SDL_mixer support)
+    if test "x$SDL_mixer_h" = "x1"; then
+      if test "x$SDL_mixer" = "xyes"; then
+        SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
+        SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
+        AC_DEFINE(SDL, 1, [SDL_Mixer support])
+        AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT([no, found header but not library!])
+      fi
+    else
+      AC_MSG_RESULT([no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html])
+    fi
+  fi
+  dnl Add WinMM sound support to client
+  if test x"$MINGW32" = "xyes"; then
+    SOUND_LIBS="$SOUND_LIBS -lwinmm"
+    AC_DEFINE(WINMM, 1, [Windows MultiMedia sound support])
+    WINMM="yes"
+  fi
+
+ fi
+])