summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-08-10 19:44:58 +0200
committerHarshavardhana <harsha@harshavardhana.net>2014-08-10 15:14:09 -0700
commitccb5dc01b8916f0e7d1e3d3535a81cc8b0f0c25e (patch)
treed4702002d5f969b9c3d93da1eaf73fa874945672
parenta1dff6498afaed5e87b383f6de6c183f52d7db41 (diff)
Always build EC xlator
Now EC xlator does not require MMX anymore, always build it. BUG: 764655 Change-Id: I50a64e22c080f2759eaa57786e7f69c34f11f89c Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8451 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Harshavardhana <harsha@harshavardhana.net>
-rw-r--r--configure.ac12
-rw-r--r--xlators/cluster/Makefile.am2
2 files changed, 1 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 4baa126254f..61ba9a28037 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,9 +353,6 @@ AC_CHECK_LIB([readline], [rl_do_undo], [RL_UNDO="yes"], [RL_UNDO="no"])
AC_CHECK_LIB([intl], [gettext])
-dnl Erasure Code xlator requires MMX instruction set
-AC_CHECK_HEADERS([xmmintrin.h], [enable_ec_xlator=yes], [enable_ec_xlator=no])
-
AC_CHECK_HEADERS([sys/xattr.h])
AC_CHECK_HEADERS([sys/ioctl.h], AC_DEFINE(HAVE_IOCTL_IN_SYS_IOCTL_H, 1, [have sys/ioctl.h]))
@@ -482,14 +479,6 @@ fi
AC_SUBST(FUSERMOUNT_SUBDIR)
#end FUSERMOUNT section
-# Erasure Code xlator section
-BUILD_EC_XLATOR=no
-if test "x$enable_ec_xlator" = "xyes" ; then
- EC_XLATOR_SUBDIR=ec
- BUILD_EC_XLATOR="yes"
-fi
-AC_SUBST(EC_XLATOR_SUBDIR)
-
# QEMU_BLOCK section
AC_ARG_ENABLE([qemu-block],
@@ -1153,5 +1142,4 @@ echo "Use syslog : $USE_SYSLOG"
echo "XML output : $BUILD_XML_OUTPUT"
echo "QEMU Block formats : $BUILD_QEMU_BLOCK"
echo "Encryption xlator : $BUILD_CRYPT_XLATOR"
-echo "Erasure Code xlator : $BUILD_EC_XLATOR"
echo
diff --git a/xlators/cluster/Makefile.am b/xlators/cluster/Makefile.am
index 0662b11acfe..903fbb39f12 100644
--- a/xlators/cluster/Makefile.am
+++ b/xlators/cluster/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = stripe afr dht @EC_XLATOR_SUBDIR@
+SUBDIRS = stripe afr dht ec
CLEANFILES =