diff options
| -rw-r--r-- | configure.ac | 31 | ||||
| -rw-r--r-- | glusterfs.spec.in | 4 | ||||
| -rw-r--r-- | xlators/Makefile.am | 4 |
3 files changed, 6 insertions, 33 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], diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 88357e519bd..a377be9ba8b 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1033,8 +1033,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/sink.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/crypt.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so @@ -1110,8 +1108,6 @@ exit 0 %files extra-xlators %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground diff --git a/xlators/Makefile.am b/xlators/Makefile.am index 29549db724e..ef20cbb64fa 100644 --- a/xlators/Makefile.am +++ b/xlators/Makefile.am @@ -2,10 +2,10 @@ if BUILD_GNFS GNFS_DIR = nfs endif -DIST_SUBDIRS = cluster storage protocol performance debug features encryption \ +DIST_SUBDIRS = cluster storage protocol performance debug features \ mount nfs mgmt system playground meta -SUBDIRS = cluster storage protocol performance debug features encryption \ +SUBDIRS = cluster storage protocol performance debug features \ mount ${GNFS_DIR} mgmt system playground meta EXTRA_DIST = xlator.sym |