diff options
| -rw-r--r-- | configure.ac | 52 | ||||
| -rw-r--r-- | src/shared/build.h | 14 |
2 files changed, 0 insertions, 66 deletions
diff --git a/configure.ac b/configure.ac index 5a52c81820..ffe648caa4 100644 --- a/configure.ac +++ b/configure.ac @@ -398,54 +398,6 @@ AC_ARG_WITH([certificate-root], AC_SUBST(CERTIFICATEROOT) # ------------------------------------------------------------------------------ -have_xz=no -AC_ARG_ENABLE(xz, AS_HELP_STRING([--disable-xz], [Disable optional XZ support])) -if test "x$enable_xz" != "xno"; then - PKG_CHECK_MODULES(XZ, [ liblzma ], - [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes], have_xz=no) - if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then - AC_MSG_ERROR([*** XZ support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_XZ, [test "$have_xz" = "yes"]) - -# ------------------------------------------------------------------------------ -have_zlib=no -AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [Disable optional ZLIB support])) -if test "x$enable_zlib" != "xno"; then - PKG_CHECK_MODULES(ZLIB, [ zlib ], - [AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available]) have_zlib=yes], have_zlib=no) - if test "x$have_zlib" = xno -a "x$enable_zlib" = xyes; then - AC_MSG_ERROR([*** ZLIB support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_ZLIB, [test "$have_zlib" = "yes"]) - -# ------------------------------------------------------------------------------ -have_bzip2=no -AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Disable optional BZIP2 support])) -AS_IF([test "x$enable_bzip2" != "xno"], [ - AC_CHECK_HEADERS(bzlib.h, - [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available]) - have_bzip2=yes], - [AS_IF([test "x$have_bzip2" = xyes], [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])]) - ]) -]) -AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"]) - -# ------------------------------------------------------------------------------ -have_lz4=no -AC_ARG_ENABLE(lz4, AS_HELP_STRING([--enable-lz4], [Enable optional LZ4 support])) -AS_IF([test "x$enable_lz4" = "xyes"], [ - AC_CHECK_HEADERS(lz4.h, - [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available]) have_lz4=yes], - [AC_MSG_ERROR([*** LZ4 support requested but headers not found])]) -]) -AM_CONDITIONAL(HAVE_LZ4, [test "$have_lz4" = "yes"]) - -AM_CONDITIONAL(HAVE_COMPRESSION, [test "$have_xz" = "yes" -o "$have_lz4" = "yes"]) - -# ------------------------------------------------------------------------------ AC_ARG_ENABLE([pam], AS_HELP_STRING([--disable-pam],[Disable optional PAM support]), [case "${enableval}" in @@ -1284,10 +1236,6 @@ AC_MSG_RESULT([ SELinux: ${have_selinux} SECCOMP: ${have_seccomp} SMACK: ${have_smack} - ZLIB: ${have_zlib} - XZ: ${have_xz} - LZ4: ${have_lz4} - BZIP2: ${have_bzip2} ACL: ${have_acl} GCRYPT: ${have_gcrypt} QRENCODE: ${have_qrencode} diff --git a/src/shared/build.h b/src/shared/build.h index 6514e591a5..9f048ee64f 100644 --- a/src/shared/build.h +++ b/src/shared/build.h @@ -75,18 +75,6 @@ #define _ACL_FEATURE_ "-ACL" #endif -#ifdef HAVE_XZ -#define _XZ_FEATURE_ "+XZ" -#else -#define _XZ_FEATURE_ "-XZ" -#endif - -#ifdef HAVE_LZ4 -#define _LZ4_FEATURE_ "+LZ4" -#else -#define _LZ4_FEATURE_ "-LZ4" -#endif - #ifdef HAVE_SECCOMP #define _SECCOMP_FEATURE_ "+SECCOMP" #else @@ -121,8 +109,6 @@ _GCRYPT_FEATURE_ " " \ _GNUTLS_FEATURE_ " " \ _ACL_FEATURE_ " " \ - _XZ_FEATURE_ " " \ - _LZ4_FEATURE_ " " \ _SECCOMP_FEATURE_ " " \ _BLKID_FEATURE_ " " \ _ELFUTILS_FEATURE_ " " \ |