From 8ee71345ece2e781ffa955498fd90283260a5403 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 13 Sep 2013 05:42:58 +0000 Subject: [PATCH] build: ldflags/cppflags conversion: libopus. Again, the --with-opus-headers option was ignored completely. In fact opus_cppflags was not even mentioned in Makefile.in. Fix this and also convert opus_ldflags as usual. --- Makefile.in | 6 ++++-- configure.ac | 11 ++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index dee22037..64307594 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,11 +20,13 @@ HELP2MAN := @help2man@ MKDIR_P := mkdir -p speex_cppflags := @speex_cppflags@ +opus_cppflags := @opus_cppflags@ id3tag_ldflags := @id3tag_ldflags@ ogg_ldflags := @ogg_ldflags@ vorbis_ldflags := @vorbis_ldflags@ speex_ldflags := @speex_ldflags@ +opus_ldflags := @opus_ldflags@ build_date := $(shell date) uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS") @@ -205,7 +207,7 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $< - +$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags) $(object_dir)/mp3_afh.o: CPPFLAGS += @id3tag_cppflags@ $(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir) @@ -266,7 +268,7 @@ para_audiod \ para_play \ para_afh \ para_recv \ -: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags) $(speex_ldflags) +: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags) $(speex_ldflags) $(opus_ldflags) para_recv: $(recv_objs) diff --git a/configure.ac b/configure.ac index b12dc181..82a0d8cb 100644 --- a/configure.ac +++ b/configure.ac @@ -666,14 +666,11 @@ else fi if test "$have_opus" = "yes"; then AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support) + AC_SUBST(opus_cppflags) + opus_ldflags="$opus_libs -lopus" + AC_SUBST(opus_ldflags) + filters="$filters opusdec" - opus_libs="-lopus" - server_ldflags="$server_ldflags $opus_libs" - filter_ldflags="$filter_ldflags $opus_libs" - audiod_ldflags="$audiod_ldflags $opus_libs" - afh_ldflags="$afh_ldflags $opus_libs" - play_ldflags="$play_ldflags $opus_libs" - recv_ldflags="$recv_ldflags $opus_libs" server_errlist_objs="$server_errlist_objs opus_afh opus_common" filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" -- 2.39.2