[MPlayer-dev-eng] [PATCH] add X11R7 support for the configure script

[Bernd Ernesti]

Hi,

this patch also checks /usr/X11R7 to find the includes and libraries.

/usr/X11R7 is the new default X11 patch on NetBSD 5 and it seems to be also
used on other linux distributions.

Bernd

-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 28702)
+++ configure	(working copy)
@@ -4146,7 +4146,8 @@
     fi
   done
   if test $_cross_compile = no; then
-    for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do
+    for I in /usr/X11/include /usr/X11R7/include /usr/X11R6/include \
+             /usr/include/X11R6 /usr/openwin/include ; do
       if test -f "$I/X11/Xlib.h" ; then
         _inc_extra="$_inc_extra -I$I"
         _x11_headers="yes"
@@ -4165,8 +4166,9 @@
 #include <X11/Xutil.h>
 int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
 EOF
-  for I in "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \
-           -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do
+  for I in "" -L/usr/X11R7/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
+           -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \
+           -L/usr/lib ; do
     if netbsd; then
       _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`"
     else