From 75590418248e30acbc316e58b2398d54b2f09569 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sat, 14 Sep 2013 02:49:43 +0000
Subject: [PATCH] build: Create section for para_audioc.

This moves everything related to para_audioc to the bottom of
configure.ac and kills @audioc_ldflags@.
---
 Makefile.in  |  2 +-
 configure.ac | 40 ++++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e847a095..9af3ac47 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -347,7 +347,7 @@ para_audiod: $(audiod_objs)
 
 para_audioc: $(audioc_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(audioc_objs) @audioc_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(audioc_objs) $(LDFLAGS)
 
 para_fade: $(fade_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
diff --git a/configure.ac b/configure.ac
index dc0dd0e0..a4daca8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,17 +92,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 executables="recv filter audioc write afh play"
 audio_format_handlers="mp3 wma"
 
-audioc_cmdline_objs="audioc"
-audioc_errlist_objs="
-	audioc
-	string
-	net
-	fd
-	version
-	ggo
-"
-audioc_ldflags=""
-
 ################################################################## clock_gettime
 clock_gettime_lib=
 AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
@@ -824,7 +813,6 @@ if test "$have_readline" = "yes"; then
 	AC_SUBST(readline_cppflags)
 	AC_SUBST(readline_ldflags)
 	client_errlist_objs="$client_errlist_objs interactive"
-	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
 	AC_MSG_WARN([libreadline not found or unusable])
@@ -1378,6 +1366,28 @@ inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
 array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
+######################################################################## audioc
+audioc_cmdline_objs="audioc"
+audioc_errlist_objs="
+	audioc
+	string
+	net
+	fd
+	version
+	ggo
+"
+if test "$have_readline" = "yes"; then
+	audioc_errlist_objs="$audioc_errlist_objs
+		buffer_tree
+		interactive
+		sched
+		time
+	"
+fi
+audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
+AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
+AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
+	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
 ############################################################# error2.h
 # these are always built
 all_errlist_objs="
@@ -1456,7 +1466,6 @@ filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
 server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
 client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
-audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
@@ -1477,11 +1486,6 @@ AC_SUBST(client_ldflags, $client_ldflags)
 AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
 	objlist_to_errlist($client_errlist_objs), errors used by para_client)
 
-AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
-AC_SUBST(audioc_ldflags, $audioc_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
-	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
-
 AC_SUBST(gui_objs, add_dot_o($gui_objs))
 AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
 	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
-- 
2.39.5