X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=9216797f6f27fcee8b311e42cb32f24005b129c0;hp=6dd9c9cdc5a45d53760fa77e2bd3790783f3d820;hb=bb40245ca352b00bb676aa5d9b87078308ef0d61;hpb=2b8a4d0a532c3bd4039f1a3ee6943ec0ef855f0d diff --git a/configure.ac b/configure.ac index 6dd9c9cdc..9216797f6 100644 --- a/configure.ac +++ b/configure.ac @@ -343,25 +343,6 @@ if test "x$enable_seccomp" != "xno"; then fi AM_CONDITIONAL(HAVE_SECCOMP, [test "$have_seccomp" = "yes"]) -# ------------------------------------------------------------------------------ -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])) @@ -392,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]]), @@ -416,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]), @@ -568,221 +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]), - [case "${enableval}" in - yes) have_audit=yes ;; - no) have_audit=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-audit) ;; - esac], - [have_audit=auto]) - -if test "x${have_audit}" != xno ; then - AC_CHECK_HEADERS( - [libaudit.h], - [have_audit=yes], - [if test "x$have_audit" = xyes ; then - AC_MSG_ERROR([*** AUDIT headers not found.]) - fi]) - - AC_CHECK_LIB( - [audit], - [audit_open], - [have_audit=yes], - [if test "x$have_audit" = xyes ; then - AC_MSG_ERROR([*** libaudit not found.]) - fi]) - - if test "x$have_audit" = xyes ; then - AUDIT_LIBS="-laudit" - AC_DEFINE(HAVE_AUDIT, 1, [AUDIT available]) - else - have_audit=no - fi -else - AUDIT_LIBS= -fi -AC_SUBST(AUDIT_LIBS) - -# ------------------------------------------------------------------------------ -AC_ARG_ENABLE([elfutils], - AS_HELP_STRING([--disable-elfutils],[Disable optional ELFUTILS support]), - [case "${enableval}" in - yes) have_elfutils=yes ;; - no) have_elfutils=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-elfutils) ;; - esac], - [have_elfutils=auto]) - -if test "x${have_elfutils}" != xno ; then - AC_CHECK_HEADERS( - [elfutils/libdwfl.h], - [], - [if test "x$have_elfutils" = xyes ; then - AC_MSG_ERROR([*** ELFUTILS headers not found.]) - fi]) - - AC_CHECK_LIB( - [dw], - [dwfl_begin], - [], - [if test "x$have_elfutils" = xyes ; then - AC_MSG_ERROR([*** ELFUTILS libs not found.]) - fi]) - - AC_CHECK_LIB( - [dw], - [dwfl_core_file_attach], - [have_elfutils=yes], - [if test "x$have_elfutils" = xyes ; then - AC_MSG_ERROR([*** ELFUTILS >= 158 is required.]) - fi]) - - if test "x$have_elfutils" = xyes ; then - ELFUTILS_LIBS="-lelf -ldw" - AC_DEFINE(HAVE_ELFUTILS, 1, [ELFUTILS available]) - else - have_elfutils=no - fi -else - ELFUTILS_LIBS= -fi -AC_SUBST(ELFUTILS_LIBS) -AM_CONDITIONAL(HAVE_ELFUTILS, [test "$have_elfutils" = "yes"]) - -# ------------------------------------------------------------------------------ -have_libcryptsetup=no -AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable libcryptsetup tools])) -if test "x$enable_libcryptsetup" != "xno"; then - PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup >= 1.6.0 ], - [AC_DEFINE(HAVE_LIBCRYPTSETUP, 1, [Define if libcryptsetup is available]) have_libcryptsetup=yes], have_libcryptsetup=no) - if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then - AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"]) - -# ------------------------------------------------------------------------------ -have_qrencode=no -AC_ARG_ENABLE(qrencode, AS_HELP_STRING([--disable-qrencode], [disable qrencode support])) -if test "x$enable_qrencode" != "xno"; then - PKG_CHECK_MODULES(QRENCODE, [ libqrencode ], - [AC_DEFINE(HAVE_QRENCODE, 1, [Define if qrencode is available]) have_qrencode=yes], have_qrencode=no) - if test "x$have_qrencode" = xno -a "x$enable_qrencode" = xyes; then - AC_MSG_ERROR([*** qrencode support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_QRENCODE, [test "$have_qrencode" = "yes"]) - -# ------------------------------------------------------------------------------ -have_microhttpd=no -AC_ARG_ENABLE(microhttpd, AS_HELP_STRING([--disable-microhttpd], [disable microhttpd support])) -if test "x$enable_microhttpd" != "xno"; then - PKG_CHECK_MODULES(MICROHTTPD, [libmicrohttpd >= 0.9.33], - [AC_DEFINE(HAVE_MICROHTTPD, 1, [Define if microhttpd is available]) have_microhttpd=yes], have_microhttpd=no) - if test "x$have_microhttpd" = xno -a "x$enable_microhttpd" = xyes; then - AC_MSG_ERROR([*** microhttpd support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_MICROHTTPD, [test "$have_microhttpd" = "yes"]) - -# ------------------------------------------------------------------------------ -have_gnutls=no -AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--disable-gnutls], [disable gnutls support])) -if test "x$enable_gnutls" != "xno"; then - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.4], - [AC_DEFINE(HAVE_GNUTLS, 1, [Define if gnutls is available]) have_gnutls=yes], have_gnutls=no) - if test "x$have_gnutls" = xno -a "x$enable_gnutls" = xyes; then - AC_MSG_ERROR([*** gnutls support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_GNUTLS, [test "$have_gnutls" = "yes"]) - -# ------------------------------------------------------------------------------ -have_libcurl=no -AC_ARG_ENABLE(libcurl, AS_HELP_STRING([--disable-libcurl], [disable libcurl support])) -if test "x$enable_libcurl" != "xno"; then - PKG_CHECK_MODULES(LIBCURL, [libcurl], - [AC_DEFINE(HAVE_LIBCURL, 1, [Define if libcurl is available]) have_libcurl=yes], have_libcurl=no) - if test "x$have_libcurl" = xno -a "x$enable_libcurl" = xyes; then - AC_MSG_ERROR([*** libcurl support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_LIBCURL, [test "$have_libcurl" = "yes"]) - -# ------------------------------------------------------------------------------ -have_libidn=no -AC_ARG_ENABLE(libidn, AS_HELP_STRING([--disable-libidn], [Disable optional LIBIDN support])) -if test "x$enable_libidn" != "xno"; then - PKG_CHECK_MODULES(LIBIDN, [libidn], - [AC_DEFINE(HAVE_LIBIDN, 1, [Define if libidn is available]) - have_libidn=yes - M4_DEFINES="$M4_DEFINES -DHAVE_LIBIDN"], - [have_libidn=no]) - if test "x$have_libidn" = "xno" -a "x$enable_libidn" = "xyes"; then - AC_MSG_ERROR([*** libidn support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_LIBIDN, [test "$have_libidn" = "yes"]) - -# ------------------------------------------------------------------------------ -have_binfmt=no -AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool])) -if test "x$enable_binfmt" != "xno"; then - have_binfmt=yes -fi -AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"]) - -# ------------------------------------------------------------------------------ -have_vconsole=no -AC_ARG_ENABLE(vconsole, AS_HELP_STRING([--disable-vconsole], [disable vconsole tool])) -if test "x$enable_vconsole" != "xno"; then - have_vconsole=yes -fi -AM_CONDITIONAL(ENABLE_VCONSOLE, [test "$have_vconsole" = "yes"]) - -# ------------------------------------------------------------------------------ -have_bootchart=no -AC_ARG_ENABLE(bootchart, AS_HELP_STRING([--disable-bootchart], [disable bootchart tool])) -if test "x$enable_bootchart" != "xno"; then - have_bootchart=yes -fi -AM_CONDITIONAL(ENABLE_BOOTCHART, [test "$have_bootchart" = "yes"]) - # ------------------------------------------------------------------------------ have_tmpfiles=no AC_ARG_ENABLE(tmpfiles, AS_HELP_STRING([--disable-tmpfiles], [disable tmpfiles support])) @@ -1296,29 +998,12 @@ AC_OUTPUT AC_MSG_RESULT([ $PACKAGE_NAME $VERSION - libcryptsetup: ${have_libcryptsetup} PAM: ${have_pam} - AUDIT: ${have_audit} 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} - ELFUTILS: ${have_elfutils} - binfmt: ${have_binfmt} - vconsole: ${have_vconsole} - bootchart: ${have_bootchart} tmpfiles: ${have_tmpfiles} sysusers: ${have_sysusers} firstboot: ${have_firstboot} @@ -1386,7 +1071,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}