1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00

The last irix64 patch looks broken to me, trying to fix.

Add X11 include&lib autodetect for solaris (/usr/openwin/{include,lib})


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2465 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
jkeil 2001-10-25 12:28:22 +00:00
parent efa761daf0
commit 69673cdc24

20
configure vendored
View File

@ -399,7 +399,7 @@ CHELP='help_mp.h'
# --- Check for C compiler: # --- Check for C compiler:
if test -z "$_x11libdir" ; then if test -z "$_x11libdir" ; then
for I in /usr/X11R6 /usr/X11 /usr/lib32 ; do for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
if test -d "$I" ; then if test -d "$I" ; then
_x11libdir="-L$I" _x11libdir="-L$I"
break; break;
@ -408,13 +408,14 @@ if test -z "$_x11libdir" ; then
fi fi
if test -z "$_x11incdir" ; then if test -z "$_x11incdir" ; then
if test -d /usr/include/X11 ; then for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
_x11incdir= if test -d "$I/X11" ; then
elif test -d /usr/X11R6 ; then if test "$I" != /usr/include; then
_x11incdir=-I/usr/X11R6/include _x11incdir="-I$I"
elif test -d /usr/X11 ; then
_x11incdir=-I/usr/X11/include
fi fi
break
fi
done
fi fi
# Lots of stuff are installed under /usr/local # Lots of stuff are installed under /usr/local
@ -890,8 +891,9 @@ _termcap=no
cc_check $_extraincdir $_extralibdir -ltermcap && _termcap=yes cc_check $_extraincdir $_extralibdir -ltermcap && _termcap=yes
_png=no _png=no
if test ! irix64 ; then if irix64 ; then
# Don't check for -png on irix : Don't check for -lpng on irix
else
cc_check $_extraincdir $_extralibdir -lpng -lz -lm && _png=yes cc_check $_extraincdir $_extralibdir -lpng -lz -lm && _png=yes
fi fi