Make sure we don't check for yasm version if we don't have yasm

This commit is contained in:
Mark Crichton 2011-03-07 05:25:01 -08:00
parent 96d2287c72
commit 1989b7dab9

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,14 +46,13 @@ 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
@ -62,10 +60,10 @@ if test "$yamajor" -ge "1" ; then
fi fi
fi fi
fi fi
else else
has_yasm=false has_yasm=false
fi
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