diff options
author | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-25 21:43:02 +0000 |
---|---|---|
committer | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-25 21:43:02 +0000 |
commit | 37e42a149bf3686a8f0ca7505c656ae2029cca4d (patch) | |
tree | 99ddce558ec34617b73756b80332a0e948db6e90 /configure | |
parent | 73a97eb400ad7eebef28ed9f3349d5107954b11f (diff) | |
download | mpv-37e42a149bf3686a8f0ca7505c656ae2029cca4d.tar.bz2 mpv-37e42a149bf3686a8f0ca7505c656ae2029cca4d.tar.xz |
The 3 X11 checks (header/lib/functionnality) are now together.
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
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 84 |
1 files changed, 43 insertions, 41 deletions
@@ -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> |