diff options
| author | Amar Tumballi <amarts@redhat.com> | 2018-12-05 20:37:53 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-12-11 04:16:33 +0000 |
| commit | 8b3a1b19fbd73545cb86029ee34033d87190bca5 (patch) | |
| tree | 9523daeef60cfceb99f8ff8aba15cde2a7debf36 /configure.ac | |
| parent | e82bcc33ed2d5cd54d3f918397f31818089299ad (diff) | |
encryption: remove crypt xlator from build
Based on the proposal to remove few features as they are not
actively maintained [1], removing crypt translator from the build.
[1] - https://lists.gluster.org/pipermail/gluster-users/2018-July/034400.html
Crypt xlator helped in on-disk / at-rest encryption of data. But
currently as there are no maintainers for this, planning to remove
it from master codebase. We are planning to host these experimental/
tech-preview xlators in another repository, so people who want to
contribute can still use the bits.
updates: bz#1635688
Change-Id: I7f2453907a595c34f635a88c49aab0845369c6e7
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 110d6051838..3ddb6f073a5 100644 --- a/configure.ac +++ b/configure.ac @@ -174,11 +174,6 @@ AC_CONFIG_FILES([Makefile xlators/playground/Makefile xlators/playground/template/Makefile xlators/playground/template/src/Makefile - xlators/encryption/Makefile - xlators/encryption/rot-13/Makefile - xlators/encryption/rot-13/src/Makefile - xlators/encryption/crypt/Makefile - xlators/encryption/crypt/src/Makefile xlators/system/Makefile xlators/system/posix-acl/Makefile xlators/system/posix-acl/src/Makefile @@ -674,6 +669,10 @@ if test "x$enable_fuse_client" != "xno"; then BUILD_FUSE_CLIENT="yes" fi +AC_SUBST(FUSE_CLIENT_SUBDIR) +# end FUSE section + + AC_CHECK_LIB([ssl], TLS_method, [HAVE_OPENSSL_1_1="yes"], [HAVE_OPENSSL_1_1="no"]) if test "x$HAVE_OPENSSL_1_1" = "xyes"; then AC_DEFINE([HAVE_TLS_METHOD], [1], [Using OpenSSL-1.1 TLS_method]) @@ -681,28 +680,6 @@ else AC_CHECK_LIB([ssl], TLSv1_2_method, [AC_DEFINE([HAVE_TLSV1_2_METHOD], [1], [Using OpenSSL-1.0 TLSv1_2_method])]) fi -# start encryption/crypt section - -AC_CHECK_HEADERS([openssl/cmac.h], [have_cmac_h=yes], [have_cmac_h=no]) - -AC_ARG_ENABLE([crypt-xlator], - AC_HELP_STRING([--enable-crypt-xlator], [Build crypt encryption xlator])) - -if test "x$enable_crypt_xlator" = "xyes" -a "x$have_cmac_h" = "xno"; then - AC_MSG_ERROR([Encryption xlator requires OpenSSL with cmac.h]) -fi - -BUILD_CRYPT_XLATOR=no -if test "x$enable_crypt_xlator" != "xno" -a "x$have_cmac_h" = "xyes"; then - BUILD_CRYPT_XLATOR=yes - AC_DEFINE(HAVE_CRYPT_XLATOR, 1, [enable building crypt encryption xlator]) -fi - -AM_CONDITIONAL([ENABLE_CRYPT_XLATOR], [test x$BUILD_CRYPT_XLATOR = xyes]) - -AC_SUBST(FUSE_CLIENT_SUBDIR) -# end FUSE section - # FUSERMOUNT section AC_ARG_ENABLE([fusermount], |