Mercurial > mplayer.hg
changeset 28911:c64bcd03ab34
Add /usr/X11R7 to the list of directories in which to search for X11 includes
and libraries. patch by Bernd Ernesti, mplayer-dev-eng lists veego.de
| author | diego |
|---|---|
| date | Sat, 14 Mar 2009 16:00:21 +0000 |
| parents | a4cee9518a50 |
| children | 26448e7dbec5 |
| files | configure |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Mar 14 15:56:16 2009 +0000 +++ b/configure Sat Mar 14 16:00:21 2009 +0000 @@ -4150,7 +4150,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" @@ -4169,8 +4170,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