[MPlayer-dev-eng] [PATCH] FreeBSD DVD Fix

[jb13 at gomerbud.com]

On Sat, Aug 21, 2004 at 07:54:18AM -0700, jb13 at gomerbud.com wrote:
> On Sat, Aug 21, 2004 at 04:12:08PM +0200, Diego Biurrun wrote:
> > Diego Biurrun writes:
> > > jb13 at gomerbud.com writes:
> > > > On Sat, Aug 21, 2004 at 01:57:33PM +0200, Diego Biurrun wrote:
> > > > > jb13 at gomerbud.com writes:
> > I take that back, sorry, of course the system_name stuff happens later
> > on...  Still, this could be done a tad cleaner.  Maybe you can add the
> > NetBSD modifications below line 500 where some other OS specific
> > things happen.
> 
> can't, the extra_libdir stuff is used by cc_chech witch will 'fail' to
> find things with out it. same with the x11 stuff.

well maybe i can, dispite sed working aganst me. at lest for the extralib
part

jb13
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.902
diff -u -r1.902 configure
--- configure	20 Aug 2004 18:29:25 -0000	1.902
+++ configure	21 Aug 2004 15:41:51 -0000
@@ -383,7 +383,6 @@
     ;;
   --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
@@ -507,6 +506,13 @@
   _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"
@@ -3196,7 +3202,11 @@
 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 ; 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