This patch is part of a series of patches for speech-tools for Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer. Index: b/audio/gen_audio.cc =================================================================== --- a/audio/gen_audio.cc +++ b/audio/gen_audio.cc @@ -103,6 +103,10 @@ protocol = "macosxaudio"; else if (win32audio_supported) protocol = "win32audio"; + else if (esd_supported) + protocol = "esdaudio"; + else if (nas_supported) + protocol = "netaudio"; else if (mplayer_supported) protocol = "mplayeraudio"; else @@ -242,10 +246,6 @@ audios += "sunaudio"; // we always support this in spite of the hardware audios += " audio_command"; - if (nas_supported) - audios += " netaudio"; - else if (esd_supported) - audios += " esdaudio"; if (sun16_supported) audios += " sun16audio"; if (freebsd16_supported) @@ -284,11 +284,7 @@ protocol = sr; else if (protocol == "") { - if (nas_supported) - protocol = "netaudio"; // the default protocol - else if (esd_supported) - protocol = "esdaudio"; // the default protocol - else if (sun16_supported) + if (sun16_supported) protocol = "sun16audio"; else if (freebsd16_supported) protocol = "freebsd16audio"; @@ -298,6 +294,10 @@ protocol = "irixaudio"; else if (win32audio_supported) protocol = "win32audio"; + else if (esd_supported) + protocol = "esdaudio"; + else if (nas_supported) + protocol = "netaudio"; else if (mplayer_supported) protocol = "mplayeraudio"; else