comparison configure @ 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 69590d5c32cf
children c2baa796c5e5
comparison
equal deleted inserted replaced
28910:a4cee9518a50 28911:c64bcd03ab34
4148 _res_comment="" 4148 _res_comment=""
4149 break 4149 break
4150 fi 4150 fi
4151 done 4151 done
4152 if test $_cross_compile = no; then 4152 if test $_cross_compile = no; then
4153 for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do 4153 for I in /usr/X11/include /usr/X11R7/include /usr/X11R6/include \
4154 /usr/include/X11R6 /usr/openwin/include ; do
4154 if test -f "$I/X11/Xlib.h" ; then 4155 if test -f "$I/X11/Xlib.h" ; then
4155 _inc_extra="$_inc_extra -I$I" 4156 _inc_extra="$_inc_extra -I$I"
4156 _x11_headers="yes" 4157 _x11_headers="yes"
4157 _res_comment="using $I" 4158 _res_comment="using $I"
4158 break 4159 break
4167 cat > $TMPC <<EOF 4168 cat > $TMPC <<EOF
4168 #include <X11/Xlib.h> 4169 #include <X11/Xlib.h>
4169 #include <X11/Xutil.h> 4170 #include <X11/Xutil.h>
4170 int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; } 4171 int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
4171 EOF 4172 EOF
4172 for I in "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \ 4173 for I in "" -L/usr/X11R7/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
4173 -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do 4174 -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \
4175 -L/usr/lib ; do
4174 if netbsd; then 4176 if netbsd; then
4175 _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`" 4177 _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`"
4176 else 4178 else
4177 _ld_tmp="$I -lXext -lX11 $_ld_pthread" 4179 _ld_tmp="$I -lXext -lX11 $_ld_pthread"
4178 fi 4180 fi