From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Jul 2014 22:18:51 +0000 (-0700)
Subject: configure: check for 'better' yasm that can build ISA-L
X-Git-Tag: v0.85~117^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8b291f30d27d150a680e5c0ef12a075590ed2d3;p=ceph.git

configure: check for 'better' yasm that can build ISA-L

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 9506b427a359..41cf0d36c712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,11 +91,21 @@ if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
       echo 'we are x86_64'
       AC_DEFINE([HAVE_GOOD_YASM_ELF64], [1], [we have a recent yasm and are x86_64])
       with_good_yasm=yes
+
+      if yasm -f elf64 -i src/ceph/src/ceph/src/erasure-code/isa/isa-l/include/ src/erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s -o /dev/null 2> /dev/null ; then
+         echo 'yasm can also build the isa-l stuff'
+	 with_better_yasm=yes
+      else
+         echo "yasm doesn't build the isa-l stuff"
+      fi
    fi
 else
    echo 'we do not have a modern/working yasm'
 fi
 AM_CONDITIONAL(WITH_GOOD_YASM_ELF64, test "$with_good_yasm" = "yes")
+AM_CONDITIONAL(WITH_BETTER_YASM_ELF64, test "$with_better_yasm" = "yes")
+
+# check for better yasm
 
 # Checks for compiler warning types
 
diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am
index 3edc7310d6b9..353620be9059 100644
--- a/src/erasure-code/Makefile.am
+++ b/src/erasure-code/Makefile.am
@@ -5,9 +5,9 @@ erasure_codelib_LTLIBRARIES =
 
 include erasure-code/jerasure/Makefile.am
 
-if WITH_GOOD_YASM_ELF64
+if WITH_BETTER_YASM_ELF64
 include erasure-code/isa/Makefile.am
-endif # WITH_GOOD_YASM_ELF64
+endif # WITH_BETTER_YASM_ELF64
 
 liberasure_code_la_SOURCES = \
 	erasure-code/ErasureCodePlugin.cc