build: ldflags conversion: libsamplerate.

Straight-forward transformation.

diff --git a/Makefile.in b/Makefile.in
index 6e7cc2de1ebdd584c20dc5a81f25bb8cce12e510..e92e0eb534388d21e0cc9e2d6ad3fd1cc8eaa58f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,6 +34,7 @@ oss_ldflags := @oss_ldflags@
 alsa_ldflags := @alsa_ldflags@
 ao_ldflags := @ao_ldflags@
 readline_ldflags := @readline_ldflags@
+samplerate_ldflags := @samplerate_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -268,10 +269,16 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 endif
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
-para_audiod para_filter para_play: LDFLAGS += $(mad_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 
+para_audiod \
+para_filter \
+para_play \
+: LDFLAGS += \
+       $(mad_ldflags) \
+       $(samplerate_ldflags)
+
 para_write \
 para_play \
 para_audiod \

diff --git a/configure.ac b/configure.ac
index bbd07609258970ab998745429e7b14ad8c1a4042..d7ec1c6e22b4c91e838e5c0257b24f1653356821 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1084,17 +1084,17 @@ AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no)
 AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, [])
 
 if test "$have_samplerate" = "yes"; then
+       AC_SUBST(samplerate_cppflags)
+       samplerate_ldflags="$samplerate_libs -lsamplerate"
+       AC_SUBST(samplerate_ldflags)
+
        filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
        filter_cmdline_objs="$filter_cmdline_objs resample_filter"
        audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
        audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
        play_errlist_objs="$play_errlist_objs resample_filter check_wav"
        play_cmdline_objs="$play_cmdline_objs resample_filter"
-       filter_ldflags="$filter_ldflags $samplerate_libs -lsamplerate"
-       audiod_ldflags="$audiod_ldflags $samplerate_libs -lsamplerate"
-       play_ldflags="$play_ldflags $samplerate_libs -lsamplerate"
        filters="$filters resample"
-       AC_SUBST(samplerate_cppflags)
 else
        AC_MSG_WARN([no resample support in para_audiod/para_filter])
 fi