mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "For static builds, add the ffmpeg library directories to the linker flags"

Browse source 
This reverts commit ac3437153d.

Doesn't actually make sense as it will put the (uninstalled) library paths
into the installed .la files. How does this all work?
This commit is contained in:
Sebastian Dröge 2015-07-28 11:19:52 +03:00
parent ac3437153d
commit 70443730a5
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -281,11 +281,7 @@ else
dnl with static linking we can't use the .a archive directly as they would dnl with static linking we can't use the .a archive directly as they would
dnl be included in the final libgstlibav.a as a file and won't be usable. dnl be included in the final libgstlibav.a as a file and won't be usable.
dnl libav*.a must be copied to the final destination too dnl libav*.a must be copied to the final destination too
LIBAV_LIBS="-L\$(top_builddir)/gst-libs/ext/libav/libavformat \ LIBAV_LIBS="-lavformat -lavcodec -lswresample -lavutil"
-L\$(top_builddir)/gst-libs/ext/libav/libavcodec \
-L\$(top_builddir)/gst-libs/ext/libav/libswresample \
-L\$(top_builddir)/gst-libs/ext/libav/libavutil \
-lavformat -lavcodec -lswresample -lavutil"
else else
dnl libgstlibav.la: libs to statically link to dnl libgstlibav.la: libs to statically link to
LIBAV_LIBS="$LIBAV_DEPS" LIBAV_LIBS="$LIBAV_DEPS"
@ -302,9 +298,7 @@ else
dnl with static linking we can't use the .a archive directly as they would dnl with static linking we can't use the .a archive directly as they would
dnl be included in the final libgstswscale.a as a file and won't be usable. dnl be included in the final libgstswscale.a as a file and won't be usable.
dnl libav*.a must be copied to the final destination too dnl libav*.a must be copied to the final destination too
SWSCALE_LIBS="-L\$(top_builddir)/gst-libs/ext/libav/libswscale \ SWSCALE_LIBS="-lswscale -lavutil"
-L\$(top_builddir)/gst-libs/ext/libav/libavutil \
-lswscale -lavutil"
else else
dnl libgstswscale.la: libs to statically link to dnl libgstswscale.la: libs to statically link to
SWSCALE_LIBS="$SWSCALE_DEPS" SWSCALE_LIBS="$SWSCALE_DEPS"