diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-05-04 09:03:25 +1200 |
|---|---|---|
| committer | jmarshallnz <jcmarsha@gmail.com> | 2014-05-04 09:03:25 +1200 |
| commit | 0d1d80373801c330e2a5dc938cc50d0d6d3ccc6d (patch) | |
| tree | ddc6351f10569baeb15ae975a103c3397fdf4799 | |
| parent | 60bd97bdd8d662807076e9838ad7632b8c92d4fa (diff) | |
| parent | a2b7ded9fd35c6323355fb8af88f250db8a8bebe (diff) | |
Merge pull request #4642 from wsnipex/linking-fix13.0-Gotham
Linking fix [fixes #15139]
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 36 |
2 files changed, 23 insertions, 15 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 d8d06df226..f3e142f26b 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 @@ -1528,20 +1529,26 @@ fi # libRTMP if test "$use_librtmp" != "no"; then - AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, - [if test "$use_librtmp" = "yes"; then - AC_MSG_ERROR($librtmp_not_found) - elif test "$use_librtmp" != "no"; then - AC_MSG_NOTICE($librtmp_not_found) - use_librtmp="no" - fi - ]) - if test "$use_librtmp" != "no"; then - XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp]) - fi - if test "$use_librtmp" != "no"; then - AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.]) - fi + PKG_CHECK_MODULES([LIBRTMP], [librtmp], + [INCLUDES="$INCLUDES $LIBRTMP_CFLAGS"; LIBS="$LIBS $LIBRTMP_LIBS"; + AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.]) + RTMP_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors librtmp) + test "$use_static_ffmpeg" = "yes" && LIBS="$LIBS $RTMP_ALL_LIBS"], + [AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, + [if test "$use_librtmp" = "yes"; then + AC_MSG_ERROR($librtmp_not_found) + elif test "$use_librtmp" != "no"; then + AC_MSG_NOTICE($librtmp_not_found) + use_librtmp="no" + fi + ]) + if test "$use_librtmp" != "no"; then + XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp]) + fi + if test "$use_librtmp" != "no"; then + AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.]) + fi + ]) else AC_MSG_NOTICE($librtmp_disabled) fi @@ -2667,6 +2674,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 |