build: ldflags conversion: libflac.

This converts the handling of the libflac linker flags, just like
the previous patches did for other libraries.

diff --git a/Makefile.in b/Makefile.in
index 80a8966c9b5dfa787834a7e2ca826d8b74a5bab0..5eb89ec29dd06e4a07403898e5fd11118de08c5e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ speex_ldflags := @speex_ldflags@
 opus_ldflags := @opus_ldflags@
 faad_ldflags := @faad_ldflags@
 mad_ldflags := @mad_ldflags@
+flac_ldflags := @flac_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -276,7 +277,8 @@ para_recv \
        $(vorbis_ldflags) \
        $(speex_ldflags) \
        $(opus_ldflags) \
-       $(faad_ldflags)
+       $(faad_ldflags) \
+       $(flac_ldflags)
 
 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

diff --git a/configure.ac b/configure.ac
index c39b0512c0eed22d17204937c1365e00e7b70ec4..1a22fd07f21b3cb11f5b6fa387985ac6f16d2bff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -828,22 +828,19 @@ AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
 AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
 if test "$have_flac" = "yes"; then
        AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
+       AC_SUBST(flac_cppflags)
+       flac_ldflags="$flac_libs -lFLAC"
+       AC_SUBST(flac_ldflags)
+
        filter_errlist_objs="$filter_errlist_objs flacdec_filter"
        audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
        play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
        afh_errlist_objs="$afh_errlist_objs flac_afh"
        server_errlist_objs="$server_errlist_objs flac_afh"
        recv_errlist_objs="$recv_errlist_objs flac_afh"
-       filter_ldflags="$filter_ldflags $flac_libs -lFLAC"
-       audiod_ldflags="$audiod_ldflags $flac_libs -lFLAC"
-       play_ldflags="$play_ldflags $flac_libs -lFLAC"
-       server_ldflags="$server_ldflags $flac_libs -lFLAC"
-       afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
-       recv_ldflags="$recv_ldflags $flac_libs -lFLAC"
        filters="$filters flacdec"
        audio_format_handlers="$audio_format_handlers flac"
        audiod_audio_formats="$audiod_audio_formats flac"
-       AC_SUBST(flac_cppflags)
 else
        AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
 fi