Use QF_NEED for plugins.

At the moment, the selection of the default sound driver etc is broken.

libs/audio/Makefile.am

@@ -11,8 +11,8 @@ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
 EXEEXT=
 
-plugin_LTLIBRARIES=	@CD_PLUGIN_TARGETS@
-noinst_LTLIBRARIES=	@CD_PLUGIN_STATIC@
+plugin_LTLIBRARIES=	@cd_plugins@
+noinst_LTLIBRARIES=	@cd_static_plugins@
 lib_LTLIBRARIES=	@CD_TARGETS@ @SND_TARGETS@
 EXTRA_LTLIBRARIES=	libQFsound.la libQFcd.la \
 					cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la \
@@ -57,14 +57,14 @@ cd_xmms_la_CFLAGS=			$(XMMS_CFLAGS)
 cd_xmms_la_SOURCES=			cd_xmms.c
 
 sound_libs= \
-	@SND_PLUGIN_STATIC_LIBS@ \
-	@SND_REND_STATIC_LIBS@ \
+	@snd_output_static_plugin_libs@ \
+	@snd_render_static_plugin_libs@ \
 	$(top_builddir)/libs/models/libQFmodels.la \
 	$(top_builddir)/libs/gamecode/libQFgamecode.la \
 	$(top_builddir)/libs/util/libQFutil.la
 
 cd_libs= \
-	@CD_PLUGIN_STATIC_LIBS@ \
+	@cd_static_plugin_libs@ \
 	$(top_builddir)/libs/util/libQFutil.la
 
 libQFsound_la_LDFLAGS=		$(lib_ldflags)

libs/audio/renderer/Makefile.am

@@ -7,11 +7,10 @@ plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=
 
-plugin_LTLIBRARIES=	@SND_REND_TARGETS@
+plugin_LTLIBRARIES=	@snd_render_plugins@
+noinst_LTLIBRARIES=	@snd_render_static_plugins@
 EXTRA_LTLIBRARIES=	snd_render_default.la snd_render_jack.la
 
-noinst_LTLIBRARIES=	@SND_REND_STATIC@
-
 flac_src=flac.c
 midi_src=midi.c
 vorbis_src=vorbis.c

libs/audio/snd.c

@@ -46,14 +46,14 @@ static plugin_t *snd_render_module = NULL;
 static plugin_t *snd_output_module = NULL;
 static snd_render_funcs_t *snd_render_funcs = NULL;
 
-SND_OUTPUT_PROTOS
+SND_OUTPUT_PLUGIN_PROTOS
 static plugin_list_t snd_output_list[] = {
-	SND_OUTPUT_LIST
+	SND_OUTPUT_PLUGIN_LIST
 };
 
-SND_RENDER_PROTOS
+SND_RENDER_PLUGIN_PROTOS
 static plugin_list_t snd_render_list[] = {
-	SND_RENDER_LIST
+	SND_RENDER_PLUGIN_LIST
 };
 
 

libs/audio/targets/Makefile.am

@@ -8,8 +8,8 @@ plugin_libadd= @plugin_libadd@
 EXEEXT=
 snd_deps=$(top_builddir)/libs/util/libQFutil.la
 
-plugin_LTLIBRARIES=	@SND_PLUGIN_TARGETS@
-noinst_LTLIBRARIES=	@SND_PLUGIN_STATIC@
+plugin_LTLIBRARIES=	@snd_output_plugins@
+noinst_LTLIBRARIES=	@snd_output_static_plugins@
 EXTRA_LTLIBRARIES= \
 	snd_output_sdl.la snd_output_alsa.la snd_output_oss.la snd_output_sgi.la \
 	snd_output_sun.la snd_output_win.la snd_output_dx.la snd_output_disk.la

libs/console/Makefile.am

@@ -9,8 +9,8 @@ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 EXEEXT=
 
 lib_LTLIBRARIES=	libQFconsole.la
-plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
-noinst_LTLIBRARIES= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@
+plugin_LTLIBRARIES= @console_plugins@
+noinst_LTLIBRARIES= @client_static_plugins@ @server_static_plugins@
 EXTRA_LTLIBRARIES=  console_server.la console_client.la
 
 common_sources= \