[Mplayer-cvslog] CVS: main configure,1.9,1.10
GEREOFFY
arpi_esp at users.sourceforge.net
Thu Mar 22 20:21:34 CET 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv10450
Modified Files:
configure
Log Message:
added --cc option patch from Bivanbi
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** configure 2001/03/10 21:05:20 1.9
--- configure 2001/03/22 19:21:32 1.10
***************
*** 7,20 ****
# Changes in reversed order:
#
! # 2000/03/08 by LGB:
# - DGA detection-o-matic :)
# - '--disable-dga' option to force disabling DGA vo driver compiling into mplayer
# - line about '--enable-dga' is added to the help message
#
! # 2000/02/26 by A'rpi:
# - added DGA option: --enable-dga
# - no notify if --with-win32libdir used [Tibcu]
#
! # 2000/02/25 by LGB:
# - TMPDIR or TEMPDIR variable is honored during tests for temporary files
# - ChangeLog inside configure was reversed ;-)
--- 7,23 ----
# Changes in reversed order:
#
! # 2001/03/22 by Bivanbi:
! # - new option: --cc (to specify C compiler path+name)
! #
! # 2001/03/08 by LGB:
# - DGA detection-o-matic :)
# - '--disable-dga' option to force disabling DGA vo driver compiling into mplayer
# - line about '--enable-dga' is added to the help message
#
! # 2001/02/26 by A'rpi:
# - added DGA option: --enable-dga
# - no notify if --with-win32libdir used [Tibcu]
#
! # 2001/02/25 by LGB:
# - TMPDIR or TEMPDIR variable is honored during tests for temporary files
# - ChangeLog inside configure was reversed ;-)
***************
*** 63,66 ****
--- 66,70 ----
params:
+ --cc use this C compiler to build MPlayer [gcc]
--enable-mmx build with mmx support [autodetect]
--enable-3dnow build with 3dnow! support [autodetect]
***************
*** 117,120 ****
--- 121,137 ----
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
+
# ---
***************
*** 288,324 ****
if [ "$proc" = "k7" ]; then
# echo -n "trying k7 "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=athlon
fi
if [ "$proc" = "athlon" ]; then
# echo -n "trying athlon "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=k6
fi
if [ "$proc" = "k6" ]; then
# echo -n "trying k6 "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=k5
fi
if [ "$proc" = "k5" ]; then
# echo -n "trying k5 "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=pentium
fi
if [ "$proc" = "i686" ]; then
# echo -n "trying i686 "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=pentiumpro
fi
if [ "$proc" = "pentiumpro" ]; then
# echo -n "trying pentiumpro "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=pentium
fi
if [ "$proc" = "pentium" ]; then
# echo -n "trying pentium "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=i486
fi
if [ "$proc" = "i486" ]; then
# echo -n "trying i486 "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=i386
fi
if [ "$proc" = "i386" ]; then
# echo -n "trying i386 "
! gcc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=error
fi
if [ "$proc" = "error" ]; then
--- 305,341 ----
if [ "$proc" = "k7" ]; then
# echo -n "trying k7 "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=athlon
fi
if [ "$proc" = "athlon" ]; then
# echo -n "trying athlon "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=k6
fi
if [ "$proc" = "k6" ]; then
# echo -n "trying k6 "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=k5
fi
if [ "$proc" = "k5" ]; then
# echo -n "trying k5 "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=pentium
fi
if [ "$proc" = "i686" ]; then
# echo -n "trying i686 "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=pentiumpro
fi
if [ "$proc" = "pentiumpro" ]; then
# echo -n "trying pentiumpro "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=pentium
fi
if [ "$proc" = "pentium" ]; then
# echo -n "trying pentium "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=i486
fi
if [ "$proc" = "i486" ]; then
# echo -n "trying i486 "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=i386
fi
if [ "$proc" = "i386" ]; then
# echo -n "trying i386 "
! $_cc $TMPC -o $TMPO -march=$proc -mcpu=$proc &> /dev/null || proc=error
fi
if [ "$proc" = "error" ]; then
***************
*** 333,340 ****
# check GL & X11 & Xext & Xv & SDL & termcap libs
! gcc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes
! gcc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
! gcc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
! gcc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lpthread &> /dev/null || \
{ echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }
--- 350,357 ----
# check GL & X11 & Xext & Xv & SDL & termcap libs
! $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=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; }
***************
*** 342,349 ****
# this is very buggy & experimental code, use it only if you really need it!!
_have_sdl=no
! gcc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes
_termcap=no
! gcc $TMPC -o $TMPO -ltermcap &> /dev/null && _termcap=yes
_binutils=no
--- 359,366 ----
# 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
***************
*** 360,364 ****
_dga=no
! gcc $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
--- 377,381 ----
_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
***************
*** 374,378 ****
EOF
! gcc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \
{ _gl=no; echo "GL includes not found!";}
--- 391,395 ----
EOF
! $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \
{ _gl=no; echo "GL includes not found!";}
***************
*** 496,504 ****
_y=`echo $ac_option | cut -d '=' -f 2`
;;
esac
done
# to screen.
!
echo "Checking for cpu vendor ... $pvendor ( $pfamily:$pmodel:$pstepping )"
echo "Checking for cpu type ... $pname"
--- 513,523 ----
_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"
***************
*** 572,576 ****
AR=ar
! CC=gcc
# OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math
--- 591,595 ----
AR=ar
! CC=$_cc
# OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list