comparison configure @ 417:1afdd7a8eaf9

small fixes, x11libdir and --disable-x11 works before the detection

416:dd528a763c6f

MCONF='config.mak'

# ---  Check for C compiler:

_cc=gcc

for ac_option
do
 case "$ac_option" in
  --cc=*)
        _cc=`echo $ac_option | cut -d '=' -f 2`
        ;;
 esac
done

# ---

_mga=no
_gl=no
_sdl=no
_xv=no
_vm=no
_x11=no
_3dfx=no
_syncfb=no
_mlib=no
_mpg123=no
_xmga=no
_dga=no
_dga2=no
_svga=no
_fbdev=no
_lirc=no
_xdpms=no

_x=1
_y=1

_gllib=
_sdllib=
_x11lib=
_xvlib=
_xlibdir=

for i in `echo $pparam`; do

 case "$i" in
  3dnow)

        ;;
 esac

done

if [ -e /usr/X11R6 ]; then
 _x11libdir=-L/usr/X11R6/lib
else
 if [ -e /usr/X11 ]; then
  _x11libdir=-L/usr/X11/lib
 fi
fi

_win32libdirnotify=no
if [ -e /usr/lib/win32 ]; then
 _win32libdir=/usr/lib/win32
else

	exit
fi
#echo "DONE (${proc})."


# check GL & X11 & Xext & Xv & SDL & termcap libs

$_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes
$_cc $TMPC -o $TMPO $_x11libdir/ -lXxf86vm &> /dev/null && _vm=yes
$_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
$_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
$_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lpthread &> /dev/null || \
 { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }

# SDL disabled by default (0.11pre22-) because of the compilation problems
# this is very buggy & experimental code, use it only if you really need it!!
_have_sdl=no
$_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes

_termcap=no
$_cc $TMPC -o $TMPO -ltermcap &> /dev/null && _termcap=yes

_binutils=no
as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes

# LGB: Check DGA

cat > $TMPC << EOF
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
int main (void) { return 0;}
EOF

_dga=no
$_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga=yes
# Note: the -lXxf86vm library is the VideoMode extension and though it's
# not needed for DGA, AFAIK every distribution packages together with DGA
# stuffs named 'X extensions' or something similar. This check can be usefull
# for further mplayer versions to set resolution by mplayer itself.
# If you run into problems, remove '-lXxf86vm'.

# ---

# Check if DGA is 2.0 or greater
cat > $TMPC << EOF
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>

EOF

_dga2=no
$_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes


cat > $TMPC << EOF
#include <GL/gl.h>
int main( void ) { return 0; }
EOF

$_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \
 { _gl=no; echo "GL includes not found!";}

rm -f $TMPC $TMPO


if [ $_x11 = 'yes' ]; then
 if [ $_mga = 'yes' ]; then
  _xmga=yes
 fi
fi

# ---

# check for the parameters.

        _xv=yes
        ;;
  --enable-vm)
        _vm=yes
        ;;
  --enable-x11)
        _x11=yes
        ;;
  --enable-3dfx)
        _3dfx=yes
        ;;
  --enable-syncfb)
        _syncfb=yes

        _xv=no
        ;;
  --disable-vm)
        _vm=no
        ;;
  --disable-x11)
        _x11=no
        ;;
  --disable-mlib)
	_mlib=no
	;;
  --disable-svga)
	_svga=no

  	_fbdev=no
	;;
  --disable-termcap)
	_termcap=no
	;;
  --with-x11libdir=*)
        _x11libdir=-L`echo $ac_option | cut -d '=' -f 2`
        ;;
  --with-win32libdir=*)
        _win32libdir=`echo $ac_option | cut -d '=' -f 2`
	_win32libdirnotify=no
        ;;
  --size-x=*)
	_x=`echo $ac_option | cut -d '=' -f 2`
	;;
  --size-y=*)
	_y=`echo $ac_option | cut -d '=' -f 2`
	;;
  --cc=*)
	;;
 esac
done

# to screen.
echo "Using C compiler: $_cc"
echo "Checking for cpu vendor ... $pvendor ( $pfamily:$pmodel:$pstepping )"
echo "Checking for cpu type ... $pname"

417:1afdd7a8eaf9

MCONF='config.mak'

# ---  Check for C compiler:

_cc=gcc
_x11=auto

_x11libdir=
if [ -e /usr/X11R6 ]; then
 _x11libdir=-L/usr/X11R6/lib
else
 if [ -e /usr/X11 ]; then
  _x11libdir=-L/usr/X11/lib
 fi
fi

for ac_option
do
 case "$ac_option" in
  --cc=*)
        _cc=`echo $ac_option | cut -d '=' -f 2`
        ;;
  --with-x11libdir=*)
        _x11libdir=-L`echo $ac_option | cut -d '=' -f 2`
        ;;
  --enable-x11)
        _x11=yes
        ;;
  --disable-x11)
        _x11=no
        ;;
 esac
done

# ---

_mga=no
_gl=no
_sdl=no
_xv=no
_vm=no
_3dfx=no
_syncfb=no
_mlib=no
_mpg123=no
_xmga=no
_dga=no
_dga2=no
_svga=no
_fbdev=yes
_lirc=no
_xdpms=no

_x=1
_y=1

_gllib=
_sdllib=
_xvlib=
_x11lib=

for i in `echo $pparam`; do

 case "$i" in
  3dnow)

        ;;
 esac

done


_win32libdirnotify=no
if [ -e /usr/lib/win32 ]; then
 _win32libdir=/usr/lib/win32
else

	exit
fi
#echo "DONE (${proc})."


$_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes

$_cc $TMPC -o $TMPO -lpthread &> /dev/null || \
 { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }

# SDL disabled by default (0.11pre22-) because of the compilation problems
# this is very buggy & experimental code, use it only if you really need it!!
_have_sdl=no
$_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes

_termcap=no
$_cc $TMPC -o $TMPO -ltermcap &> /dev/null && _termcap=yes

_binutils=no
as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes

# ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) --------------

if [ $_x11 = auto ]; then
  _x11=no
  $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
fi

if [ $_x11 = yes ]; then

$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
$_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes

$_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes

cat > $TMPC << EOF
#include <GL/gl.h>
int main( void ) { return 0; }
EOF
$_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \
 { _gl=no; echo "GL includes not found!";}

$_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes

cat > $TMPC << EOF
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
int main (void) { return 0;}
EOF

$_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga=yes
# Note: the -lXxf86vm library is the VideoMode extension and though it's
# not needed for DGA, AFAIK every distribution packages together with DGA
# stuffs named 'X extensions' or something similar. This check can be usefull
# for further mplayer versions to set resolution by mplayer itself.
# If you run into problems, remove '-lXxf86vm'.

# Check if DGA is 2.0 or greater
cat > $TMPC << EOF
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>

EOF

_dga2=no
$_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes

fi

rm -f $TMPC $TMPO

# ---

# check for the parameters.

        _xv=yes
        ;;
  --enable-vm)
        _vm=yes
        ;;
  --enable-3dfx)
        _3dfx=yes
        ;;
  --enable-syncfb)
        _syncfb=yes

        _xv=no
        ;;
  --disable-vm)
        _vm=no
        ;;
  --disable-mlib)
	_mlib=no
	;;
  --disable-svga)
	_svga=no

  	_fbdev=no
	;;
  --disable-termcap)
	_termcap=no
	;;
  --with-win32libdir=*)
        _win32libdir=`echo $ac_option | cut -d '=' -f 2`
	_win32libdirnotify=no
        ;;
  --size-x=*)
	_x=`echo $ac_option | cut -d '=' -f 2`
	;;
  --size-y=*)
	_y=`echo $ac_option | cut -d '=' -f 2`
	;;
  --with-x11libdir=*)
        ;;
  --cc=*)
	;;
 esac
done

if [ $_x11 = 'yes' ]; then
 if [ $_mga = 'yes' ]; then
  _xmga=yes
 fi
fi

# to screen.
echo "Using C compiler: $_cc"
echo "Checking for cpu vendor ... $pvendor ( $pfamily:$pmodel:$pstepping )"
echo "Checking for cpu type ... $pname"