Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fleger 2011-03-12 18:12:44 +01:00
commit cb62c7f4de

View file

@ -1,4 +1,3 @@
AC_INIT([cpuminer], [0.7.1]) AC_INIT([cpuminer], [0.7.1])
AC_PREREQ(2.52) AC_PREREQ(2.52)
@ -47,25 +46,24 @@ has_yasm=false
AC_PATH_PROG(YASM,[yasm],[true yasm]) AC_PATH_PROG(YASM,[yasm],[true yasm])
if test "$YASM" = "false" ; then if test "$YASM" = "false" ; then
AC_MSG_WARN([yasm is required for the x86_64 SSE2 code, but it was not found]) AC_MSG_WARN([yasm is required for the x86_64 SSE2 code, but it was not found])
fi else
AC_MSG_CHECKING([if yasm version is greater than 1.0.1])
AC_MSG_CHECKING([if yasm version is greater than 1.0.1]) yasmver=`yasm --version | head -1 | cut -d\ -f2`
yasmver=`yasm --version | head -1 | cut -d\ -f2` yamajor=`echo $yasmver | cut -d. -f1`
yamajor=`echo $yasmver | cut -d. -f1` yaminor=`echo $yasmver | cut -d. -f2`
yaminor=`echo $yasmver | cut -d. -f2` yamini=`echo $yasmver | cut -d. -f3`
yamini=`echo $yasmver | cut -d. -f3` if test "$yamajor" -ge "1" ; then
if test "$yamajor" -ge "1" ; then if test "$yamajor" -eq "1" ; then
if test "$yamajor" -eq "1" ; then if test "$yaminor" -ge "0" ; then
if test "$yaminor" -ge "0" ; then if test "$yamini" -ge "1"; then
if test "$yamini" -ge "1"; then has_yasm=true
has_yasm=true fi
fi fi
fi fi
else
has_yasm=false
fi fi
else
has_yasm=false
fi fi
if test "x$has_yasm" != "x" ; then if test "x$has_yasm" != "x" ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else