RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-14 02:45:43 +00:00
Code Issues Releases Wiki Activity

The 3 X11 checks (header/lib/functionnality) are now together.

Browse Source 
Tests for header & lib enhanced (check for Xlib.h and libX11.so/a)
(Suggestion by Arpi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6192 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2002-05-25 21:43:02 +00:00
parent 73a97eb400
commit 37e42a149b
1 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
configure vendored
View File

@ -1812,46 +1812,6 @@ fi
echores "$_vsscanf"
echocheck "X11 headers"
if test -z "$_inc_x11" ; then
for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
if test -d "$I/X11" ; then
_inc_x11="-I$I"
echores "yes (using $I)"
break
fi
done
if test -z "$_inc_x11" ; then
_x11=no
echores "not found"
fi
else
echores "yes (using $_inc_x11)"
fi
if test "$_inc_x11" = "-I/usr/include" ; then
_inc_x11=""
fi
echocheck "X11 libs"
if test -z "$_ld_x11" ; then
for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 ; do
if test -d "$I" ; then
_ld_x11="-L$I"
echores "yes (using $I)"
break;
fi
done
if test -z "$_ld_x11" ; then
_x11=no
echores "not found"
fi
else
echores "yes (using $_ld_x11)"
fi
_ld_x11="$_ld_x11 -lX11 -lXext $_ld_sock"
#########
# VIDEO #
#########
@ -1931,8 +1891,50 @@ else
fi
echores "$_directfb0910"
fi
echocheck "X11 headers presence"
if test -z "$_inc_x11" ; then
for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
if test -d "$I/X11" && test -f "$I/X11/Xlib.h" ; then
_inc_x11="-I$I"
echores "yes (using $I)"
break
fi
done
if test -z "$_inc_x11" ; then
_x11=no
echores "not found (check if the dev(el) packages are installed)"
fi
else
echores "yes (using $_inc_x11)"
fi
if test "$_inc_x11" = "-I/usr/include" ; then
_inc_x11=""
fi
echocheck "X11 libs presence"
if test -z "$_ld_x11" ; then
for I in /usr/X11R6/lib /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" ) ; then
_ld_x11="-L$I"
echores "yes (using $I)"
break;
fi
done
if test -z "$_ld_x11" ; then
_x11=no
echores "not found (check if the dev(el) packages are installed)"
fi
else
echores "yes (using $_ld_x11)"
fi
_ld_x11="$_ld_x11 -lX11 -lXext $_ld_sock"
echocheck "X11"
if test "$_x11" = auto || test "$_x11" = yes ; then
if test "$_x11" != no ; then
cat > $TMPC <<EOF
#include <X11/Xlib.h>
#include <X11/Xutil.h>