From da1fd227bf2cc56c6f9a7ea42bd2c8b05f781f06 Mon Sep 17 00:00:00 2001 From: fleger Date: Tue, 8 Mar 2011 01:12:03 -0800 Subject: [PATCH 1/3] =?UTF-8?q?Fixed=20yasm=20version=20check=20if=20yasm?= =?UTF-8?q?=20version=20=E2=89=A5=201.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c0d3dd9..f018602 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ - AC_INIT([cpuminer], [0.7.1]) AC_PREREQ(2.52) @@ -57,15 +56,20 @@ yamini=`echo $yasmver | cut -d. -f3` if test "$yamajor" -ge "1" ; then if test "$yamajor" -eq "1" ; then if test "$yaminor" -ge "0" ; then - if test "$yamini" -ge "1"; then + if test "$yaminor" -eq "0"; then + if test "$yamini" -ge "1"; then + has_yasm=true + fi + else has_yasm=true fi fi fi else -has_yasm=false + has_yasm=false fi + if test "x$has_yasm" != "x" ; then AC_MSG_RESULT([yes]) else From 115cbe64f65e82352228158595b129e88ef91758 Mon Sep 17 00:00:00 2001 From: fleger Date: Sat, 12 Mar 2011 18:11:33 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"Fixed=20yasm=20version=20check=20?= =?UTF-8?q?if=20yasm=20version=20=E2=89=A5=201.1.0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit da1fd227bf2cc56c6f9a7ea42bd2c8b05f781f06. --- configure.ac | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index f018602..c0d3dd9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,4 @@ + AC_INIT([cpuminer], [0.7.1]) AC_PREREQ(2.52) @@ -56,20 +57,15 @@ yamini=`echo $yasmver | cut -d. -f3` if test "$yamajor" -ge "1" ; then if test "$yamajor" -eq "1" ; then if test "$yaminor" -ge "0" ; then - if test "$yaminor" -eq "0"; then - if test "$yamini" -ge "1"; then - has_yasm=true - fi - else + if test "$yamini" -ge "1"; then has_yasm=true fi fi fi else - has_yasm=false +has_yasm=false fi - if test "x$has_yasm" != "x" ; then AC_MSG_RESULT([yes]) else From aab6f57b17b97bf65860d6ae86ed4a27f00c2627 Mon Sep 17 00:00:00 2001 From: fleger Date: Sat, 12 Mar 2011 18:23:22 +0100 Subject: [PATCH 3/3] Fixed yasm version check --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 074c37a..721cb0d 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,11 @@ else if test "$yamajor" -ge "1" ; then if test "$yamajor" -eq "1" ; then if test "$yaminor" -ge "0" ; then - if test "$yamini" -ge "1"; then + if test "$yaminor" -eq "0"; then + if test "$yamini" -ge "1"; then + has_yasm=true + fi + else has_yasm=true fi fi