X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=ef47c5fcffa40c71f3e71ed11e25220040ac770b;hb=70238105246969a045d0e256ed3983afe5ddbb96;hp=40f60431eb783322707d6806ca9c415439a3f263;hpb=ec9259f0034043edd2878a22be7f7c86e18c70b4;p=elogind.git diff --git a/configure.ac b/configure.ac index 40f60431e..ef47c5fcf 100644 --- a/configure.ac +++ b/configure.ac @@ -316,18 +316,6 @@ if test "x$enable_coverage" = "xyes" ; then fi AM_CONDITIONAL(ENABLE_COVERAGE, [test "$have_coverage" = "yes"]) -# ------------------------------------------------------------------------------ -have_xkbcommon=no -AC_ARG_ENABLE(xkbcommon, AS_HELP_STRING([--disable-xkbcommon], [disable xkbcommon keymap support])) -if test "x$enable_xkbcommon" != "xno"; then - PKG_CHECK_MODULES(XKBCOMMON, [ xkbcommon >= 0.3.0 ], - [AC_DEFINE(HAVE_XKBCOMMON, 1, [Define if libxkbcommon is available]) have_xkbcommon=yes], have_xkbcommon=no) - if test "x$have_xkbcommon" = xno -a "x$enable_xkbcommon" = xyes; then - AC_MSG_ERROR([*** xkbcommon support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"]) - # ------------------------------------------------------------------------------ have_blkid=no AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [disable blkid support])) @@ -355,39 +343,6 @@ if test "x$enable_seccomp" != "xno"; then fi AM_CONDITIONAL(HAVE_SECCOMP, [test "$have_seccomp" = "yes"]) -# ------------------------------------------------------------------------------ -have_ima=yes -AC_ARG_ENABLE([ima], AS_HELP_STRING([--disable-ima],[Disable optional IMA support]), - [case "${enableval}" in - yes) have_ima=yes ;; - no) have_ima=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-ima) ;; - esac], - [have_ima=yes]) - -if test "x${have_ima}" != xno ; then - AC_DEFINE(HAVE_IMA, 1, [Define if IMA is available]) -fi - -# ------------------------------------------------------------------------------ -have_chkconfig=yes -AC_ARG_ENABLE([chkconfig], AS_HELP_STRING([--disable-chkconfig],[Disable optional chkconfig support]), - [case "${enableval}" in - yes) have_chkconfig=yes ;; - no) have_chkconfig=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-chkconfig) ;; - esac], - [AC_PATH_PROG(CHKCONFIG, chkconfig) - if test -z "$CHKCONFIG"; then - have_chkconfig=no - else - have_chkconfig=yes - fi]) - -if test "x${have_chkconfig}" != xno ; then - AC_DEFINE(HAVE_CHKCONFIG, 1, [Define if CHKCONFIG is available]) -fi - # ------------------------------------------------------------------------------ have_selinux=no AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support])) @@ -418,22 +373,6 @@ fi AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"]) -AC_ARG_WITH(debug-shell, - AS_HELP_STRING([--with-debug-shell=PATH], - [Path to debug shell binary]), - [SUSHELL="$withval"],[ - AS_IF([test "x${have_selinux}" != "xno"], [SUSHELL="/sbin/sushell"] , [SUSHELL="/bin/sh"])]) - -AC_SUBST(SUSHELL) - -AC_ARG_WITH([debug-tty], - AS_HELP_STRING([--with-debug-tty=PATH], - [Specify the tty device for debug shell]), - [DEBUGTTY="$withval"], - [DEBUGTTY=/dev/tty9]) - -AC_SUBST(DEBUGTTY) - AC_ARG_WITH([certificate-root], AS_HELP_STRING([--with-certificate-root=PATH], [Specify the prefix for TLS certificates [/etc/ssl]]), @@ -442,54 +381,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]), @@ -594,39 +485,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) -# ------------------------------------------------------------------------------ -AC_ARG_ENABLE([gcrypt], - AS_HELP_STRING([--disable-gcrypt],[Disable optional GCRYPT support]), - [case "${enableval}" in - yes) have_gcrypt=yes ;; - no) have_gcrypt=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-gcrypt) ;; - esac], - [have_gcrypt=auto]) - -if test "x${have_gcrypt}" != xno ; then - AM_PATH_LIBGCRYPT( - [1.4.5], - [have_gcrypt=yes], - [if test "x$have_gcrypt" = xyes ; then - AC_MSG_ERROR([*** GCRYPT headers not found.]) - fi]) - - if test "x$have_gcrypt" = xyes ; then - GCRYPT_LIBS="$LIBGCRYPT_LIBS" - GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS" - AC_DEFINE(HAVE_GCRYPT, 1, [GCRYPT available]) - else - have_gcrypt=no - fi -else - GCRYPT_LIBS= - GCRYPT_CFLAGS= -fi -AC_SUBST(GCRYPT_LIBS) -AC_SUBST(GCRYPT_CFLAGS) -AM_CONDITIONAL([HAVE_GCRYPT], [test "x$have_gcrypt" != xno]) - # ------------------------------------------------------------------------------ AC_ARG_ENABLE([audit], AS_HELP_STRING([--disable-audit],[Disable optional AUDIT support]), @@ -1065,27 +923,6 @@ AS_IF([test "x$enable_gnuefi" != "xno"], [ ]) AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes]) -# ------------------------------------------------------------------------------ -AC_ARG_WITH(unifont, - AS_HELP_STRING([--with-unifont=PATH], - [Path to unifont.hex]), - [UNIFONT="$withval"], - [UNIFONT="/usr/share/unifont/unifont.hex"]) -AC_SUBST(UNIFONT) - -have_terminal=no -have_unifont=no -AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support])) -if test "x$enable_terminal" = "xyes"; then - PKG_CHECK_MODULES([TERMINAL], [ libevdev >= 1.2 xkbcommon >= 0.5 libdrm >= 2.4], [have_terminal=yes]) - AC_CHECK_FILE($UNIFONT, [have_unifont=yes]) - AS_IF([test "x$have_terminal" != xyes -o "x$have_unifont" != "xyes" -a "x$enable_terminal" = xyes], - [AC_MSG_ERROR([*** terminal support requested but required dependencies not available])], - [test "x$have_terminal" = xyes -a "x$have_unifont" = "xyes"], - [AC_DEFINE(ENABLE_TERMINAL, 1, [Define if terminal support is to be enabled])]) -fi -AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes" -a "x$have_unifont" = "xyes"]) - # ------------------------------------------------------------------------------ have_kdbus=no AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default])) @@ -1346,20 +1183,13 @@ AC_MSG_RESULT([ libcryptsetup: ${have_libcryptsetup} PAM: ${have_pam} AUDIT: ${have_audit} - IMA: ${have_ima} AppArmor: ${have_apparmor} 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} MICROHTTPD: ${have_microhttpd} - CHKCONFIG: ${have_chkconfig} GNUTLS: ${have_gnutls} libcurl: ${have_libcurl} libidn: ${have_libidn} @@ -1395,13 +1225,11 @@ AC_MSG_RESULT([ EFI libdir: ${EFI_LIB_DIR} EFI ldsdir: ${EFI_LDS_DIR} EFI includedir: ${EFI_INC_DIR} - xkbcommon: ${have_xkbcommon} blkid: ${have_blkid} dbus: ${have_dbus} nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} hwdb: ${enable_hwdb} - terminal: ${have_terminal} kdbus: ${have_kdbus} Python: ${have_python} Python Headers: ${have_python_devel} @@ -1436,7 +1264,6 @@ AC_MSG_RESULT([ Zsh completions dir: ${with_zshcompletiondir} Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP} - Debug shell: ${SUSHELL} @ ${DEBUGTTY} TTY GID: ${TTY_GID} Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX}