From 8351d2ba75aa1d484a44f6d1cc9b1dba806a3752 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 17 Jul 2008 16:28:48 +0000
Subject: Replace LDLATEFLAGS hackery by proper LDFLAGS tests. The original
 reasons for LDLATEFLAGS are lost in the mists of time.

Originally committed as revision 14263 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 configure | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 564ff03815..074b3ab844 100755
--- a/configure
+++ b/configure
@@ -962,7 +962,6 @@ vhook="default"
 # build settings
 SHFLAGS='-shared -Wl,-soname,$$(@F)'
 VHOOKSHFLAGS='$(SHFLAGS)'
-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
 FFSERVERLDFLAGS=-Wl,-E
 LIBPREF="lib"
 LIBSUF=".a"
@@ -1293,7 +1292,6 @@ case $target_os in
         EXESUF=".exe"
         ;;
     linux)
-        LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
         enable dv1394
         ;;
     irix*)
@@ -1831,7 +1829,8 @@ enabled extra_warnings && check_cflags -Winline
 
 # add some linker flags
 check_ldflags -Wl,--warn-common
-check_ldflags $LDLATEFLAGS
+check_ldflags -Wl,--as-needed
+check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
 check_ldflags -Wl,-Bsymbolic
 
 if enabled small; then
-- 
cgit v1.2.3