From 70443730a509037ea85331dcf2b6e53ad403f77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 28 Jul 2015 11:19:52 +0300 Subject: [PATCH] Revert "For static builds, add the ffmpeg library directories to the linker flags" This reverts commit ac3437153dc6cb3d82cdda0d1f60ffc5600fdf67. Doesn't actually make sense as it will put the (uninstalled) library paths into the installed .la files. How does this all work? --- configure.ac | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index ff797218ec..c00bdf7210 100644 --- a/configure.ac +++ b/configure.ac @@ -281,11 +281,7 @@ else 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 libav*.a must be copied to the final destination too - LIBAV_LIBS="-L\$(top_builddir)/gst-libs/ext/libav/libavformat \ - -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" + LIBAV_LIBS="-lavformat -lavcodec -lswresample -lavutil" else dnl libgstlibav.la: libs to statically link to 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 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 - SWSCALE_LIBS="-L\$(top_builddir)/gst-libs/ext/libav/libswscale \ - -L\$(top_builddir)/gst-libs/ext/libav/libavutil \ - -lswscale -lavutil" + SWSCALE_LIBS="-lswscale -lavutil" else dnl libgstswscale.la: libs to statically link to SWSCALE_LIBS="$SWSCALE_DEPS"