[Mplayer-cvslog] CVS: main configure,1.906,1.907

Diego Biurrun CVS syncmail at mplayerhq.hu
Thu Aug 26 03:06:06 CEST 2004


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv7972

Modified Files:
	configure 
Log Message:
properly set linking flags for NetBSD, patch by jb13 at gomerbud.com


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -r1.906 -r1.907
--- configure	25 Aug 2004 15:40:06 -0000	1.906
+++ configure	26 Aug 2004 01:06:02 -0000	1.907
@@ -384,7 +384,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
@@ -508,6 +507,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"
@@ -3202,7 +3208,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 /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




More information about the MPlayer-cvslog mailing list