summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-26 01:06:02 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-26 01:06:02 +0000
commitfe68e2d692c03d5cd62f682aefdc6fdf59c07f63 (patch)
tree154c5a417cfb78559ff37cc8d9ee1c53aad04bbc
parent121e49df0d770e725b7701a7da8d726b9950ffe8 (diff)
downloadmpv-fe68e2d692c03d5cd62f682aefdc6fdf59c07f63.tar.bz2
mpv-fe68e2d692c03d5cd62f682aefdc6fdf59c07f63.tar.xz
properly set linking flags for NetBSD, patch by jb13@gomerbud.com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13145 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure14
1 files changed, 12 insertions, 2 deletions
diff --git a/configure b/configure
index c3aef1fa5f..278db7c5b8 100755
--- a/configure
+++ b/configure
@@ -384,7 +384,6 @@ for ac_option do
;;
--with-extralibdir=*)
_ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-# _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
;;
--enable-runtime-cpudetection)
_runtime_cpudetection=yes
@@ -508,6 +507,13 @@ if freebsd ; then
_inc_extra="$_inc_extra -I/usr/local/include"
fi
+if netbsd ; then
+ for I in `echo $_ld_extra | sed 's/-L//g'` ; do
+ tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
+ done
+ _ld_extra=$tmp
+fi
+
_ldd=ldd
if darwin; then
_ldd="otool -L"
@@ -3202,7 +3208,11 @@ echocheck "X11 libs presence"
if test -z "$_ld_x11" ; then
for I in /usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib ; do
if test -d "$I" && ( test -f "$I/libX11.so" || test -f "$I/libX11.a" || test -f "$I/libX11.dll.a" ) ; then
- _ld_x11="-L$I"
+ if netbsd; then
+ _ld_x11="-L$I -Wl,-R$I"
+ else
+ _ld_x11="-L$I"
+ fi
echores "yes (using $I)"
break;
fi