From 6a2d052e300014e5c2f70996170689bc7be42430 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Sun, 9 Feb 2014 22:13:51 -0600 Subject: [PATCH] Whoopsie, let's not clobber LDFLAGS now --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8946e0798b..136bdd17d0 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,7 @@ dnl NOTE: This won't be hardcoded "yes" later when we implement --with-license CFLAGS="$CFLAGS -I$PWD/bundle/ffmpeg" CXXFLAGS="$CXXFLAGS -I$PWD/bundle/ffmpeg" dnl Make the binary find our bundled libs - LDFLAGS="-Wl,-rpath=bundle/ffmpeg/libavutil,-rpath=bundle/ffmpeg/libavformat,-rpath=bundle/ffmpeg/libavcodec,-rpath=bundle/ffmpeg/libswscale" + LDFLAGS="$LDFLAGS -Wl,-rpath=bundle/ffmpeg/libavutil,-rpath=bundle/ffmpeg/libavformat,-rpath=bundle/ffmpeg/libavcodec,-rpath=bundle/ffmpeg/libswscale" dnl Classic autoconf. This CANNOT be broken across multiple lines. FFMPEG_LIBS="-L$PWD/bundle/ffmpeg/libavutil -lavutil -L$PWD/bundle/ffmpeg/libavformat -lavformat -L$PWD/bundle/ffmpeg/libavcodec -lavcodec -L$PWD/bundle/ffmpeg/libswscale -lswscale" fi