From d420b5cc2ddeacca71096f2da4c1f70eeb97a91c Mon Sep 17 00:00:00 2001 From: wsnipex Date: Sat, 3 May 2014 12:41:42 +0200 Subject: [configure] fix static linking when ffmpeg found nettle/hogweed --- Makefile.in | 2 +- configure.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 1db6ee22c2..754f15396b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -481,7 +481,7 @@ FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \ lib/ffmpeg/libpostproc/libpostproc.a \ lib/ffmpeg/libswscale/libswscale.a DYNOBJSXBMC+= $(FFMPEGOBJS) -LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ +LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@ $(FFMPEGOBJS): dvdpcodecs endif diff --git a/configure.in b/configure.in index 37e08f69b7..806680f355 100644 --- a/configure.in +++ b/configure.in @@ -880,6 +880,7 @@ if test "$use_static_ffmpeg" = "yes"; then # ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker # command in order to resolve any missing symbols GNUTLS_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls` + HOGWEED_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors hogweed nettle` VORBISENC_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc` fi @@ -2674,6 +2675,7 @@ AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) AC_SUBST(GNUTLS_ALL_LIBS) +AC_SUBST(HOGWEED_ALL_LIBS) AC_SUBST(VORBISENC_ALL_LIBS) # pushd and popd are not available in other shells besides bash, so implement -- cgit v1.2.3