From 7aa41429957666cdc8bea237224a5b1d55ddbb8c Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 13 Sep 2013 05:31:09 +0000 Subject: [PATCH] build: ldflags conversion: libvorbis. Same rationale as the previous patch, this time with vorbis_ldflags. --- Makefile.in | 4 +++- configure.ac | 11 ++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index bb4be2ff..b04cbdb7 100644 --- 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 2f2de09b..0dd08a48 100644 --- 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) -- 2.39.5