build: ldflags conversion: libvorbis.

Same rationale as the previous patch, this time with vorbis_ldflags.

diff --git a/Makefile.in b/Makefile.in
index bb4be2ff743274f1e6f7f0044cc7e3526e6513ad..b04cbdb74923f78d9b16bfef24a531ed769e3ef0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ MKDIR_P := mkdir -p
 
 id3tag_ldflags := @id3tag_ldflags@
 ogg_ldflags := @ogg_ldflags@
+vorbis_ldflags := @vorbis_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -262,7 +263,8 @@ para_audiod \
 para_play \
 para_afh \
 para_recv \
-: LDFLAGS += $(ogg_ldflags)
+: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags)
+
 
 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

diff --git a/configure.ac b/configure.ac
index 2f2de09be029e2fe832291338b616c86baa36c25..0dd08a48f0d9559b6b05a7fd7505eccf7574433d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -631,13 +631,8 @@ fi
 if test "$have_vorbis" = "yes"; then
        AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
        filters="$filters oggdec"
-       vorbis_libs="-lvorbis -lvorbisfile"
-       server_ldflags="$server_ldflags $vorbis_libs"
-       filter_ldflags="$filter_ldflags $vorbis_libs"
-       audiod_ldflags="$audiod_ldflags $vorbis_libs"
-       play_ldflags="$play_ldflags $vorbis_libs"
-       afh_ldflags="$afh_ldflags $vorbis_libs"
-       recv_ldflags="$recv_ldflags $vorbis_libs"
+       vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
+       AC_SUBST(vorbis_ldflags)
 
        server_errlist_objs="$server_errlist_objs ogg_afh"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
@@ -648,8 +643,6 @@ if test "$have_vorbis" = "yes"; then
 
        audiod_audio_formats="$audiod_audio_formats ogg"
        audio_format_handlers="$audio_format_handlers ogg"
-else
-       AC_MSG_WARN([no ogg/vorbis $msg])
 fi
 if test "$have_speex" = "yes"; then
        AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)