diff options
| author | wsnipex <wsnipex@a1.net> | 2014-05-03 12:41:42 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2014-05-06 08:19:46 +0200 |
| commit | d420b5cc2ddeacca71096f2da4c1f70eeb97a91c (patch) | |
| tree | 922e184d79151e439408581cd27b3f5f7dca40a9 | |
| parent | d4330f6fb9c18c3be4445084df8b552f2bd5a150 (diff) | |
[configure] fix static linking when ffmpeg found nettle/hogweed
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 3 insertions, 1 deletions
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 |