summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorlaaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-17 15:04:09 +0000
committerlaaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-17 15:04:09 +0000
commit1a3cbadcc3635c37de5cb4e4956dc27d09bf955e (patch)
tree3ab62310be05426b2d8bf06c6000c0b95e9d6cfa /configure
parent621a5807a5a6ae09a6f811c29103cecbbac4f81d (diff)
downloadmpv-1a3cbadcc3635c37de5cb4e4956dc27d09bf955e.tar.bz2
mpv-1a3cbadcc3635c37de5cb4e4956dc27d09bf955e.tar.xz
Added X 4.0 DPMS support for configure script
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1903 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure b/configure
index a7b3da1799..fd9a34ca5b 100755
--- a/configure
+++ b/configure
@@ -470,7 +470,8 @@ _aa=no
_ggi=no
_xv=no
_vm=no
-_xdpms=no
+_xdpms_3=no
+_xdpms_4=no
_3dfx=no
_syncfb=no
_mlib=no _mlibdir=/opt/SUNWmlib
@@ -853,7 +854,8 @@ fi
if [ $_x11 = yes ]; then
-$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms $_socklib > /dev/null 2>&1 && _xdpms=yes
+$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms $_socklib > /dev/null 2>&1 && _xdpms_3=yes
+nm `echo $_x11libdir|cut -b 3-`/libXext.a | grep -q DPMSQueryExtension && _xdpms_4=yes
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXv $_socklib > /dev/null 2>&1 && _xv=yes
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXxf86vm $_socklib > /dev/null 2>&1 && _vm=yes
@@ -1747,15 +1749,21 @@ else
fi
if [ $_x11 = yes ]; then
- if [ $_xdpms = yes ]; then
+ if [ $_xdpms_3 = yes ]; then
_x11lib='-lX11 -lXext -lXdpms'
_have_xdpms='#define HAVE_XDPMS 1'
+ elif [ $_xdpms_4 = yes ]; then
+ _x11lib='-lX11 -lXext'
+ _have_xdpms='#define HAVE_XDPMS 1'
else
_x11lib='-lX11 -lXext'
_have_xdpms='#undef HAVE_XDPMS'
fi
fi
+echo XXXXXXXXXX $_xdpms_3 $_xdpms_4
+
+
if [ $_xv = yes ]; then
_xvlib='-lXv'
fi