X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=568d56c95f9745a3daf7c9fd79033e7b8036d600;hp=802dcd916eea3f7c2e1881b72423c4a0e927fe36;hb=96408316212ad291aa1986a1bc91e682404cdb04;hpb=0b59cf27e82f4f366ea5af1be288557d62bab385 diff --git a/configure.ac b/configure.ac index 802dcd916..568d56c95 100644 --- a/configure.ac +++ b/configure.ac @@ -505,14 +505,6 @@ AC_ARG_WITH(system-gid-max, AC_DEFINE_UNQUOTED(SYSTEM_GID_MAX, [$SYSTEM_GID_MAX], [Maximum System GID]) AC_SUBST(SYSTEM_GID_MAX) -# ------------------------------------------------------------------------------ -have_coredump=no -AC_ARG_ENABLE(coredump, AS_HELP_STRING([--disable-coredump], [disable coredump hook])) -if test "x$enable_coredump" != "xno"; then - have_coredump=yes -fi -AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"]) - # ------------------------------------------------------------------------------ have_polkit=no AC_ARG_ENABLE(polkit, AS_HELP_STRING([--disable-polkit], [disable PolicyKit support])) @@ -522,90 +514,6 @@ if test "x$enable_polkit" != "xno"; then fi AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"]) -# ------------------------------------------------------------------------------ -have_resolved=no -AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon])) -if test "x$enable_resolved" != "xno"; then - have_resolved=yes - M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED" -fi -AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"]) - -AC_ARG_WITH(dns-servers, - AS_HELP_STRING([--with-dns-servers=DNSSERVERS], - [Space-separated list of default DNS servers]), - [DNS_SERVERS="$withval"], - [DNS_SERVERS="8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844"]) - -AC_DEFINE_UNQUOTED(DNS_SERVERS, ["$DNS_SERVERS"], [Default DNS Servers]) -AC_SUBST(DNS_SERVERS) - -# ------------------------------------------------------------------------------ -have_efi=no -AC_ARG_ENABLE(efi, AS_HELP_STRING([--disable-efi], [disable EFI support])) -if test "x$enable_efi" != "xno"; then - AC_DEFINE(ENABLE_EFI, 1, [Define if EFI support is to be enabled]) - have_efi=yes -fi -AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) - -# ------------------------------------------------------------------------------ -EFI_CC=gcc -AC_SUBST([EFI_CC]) - -EFI_ARCH=`echo $host | sed "s/\(-\).*$//"` - -AM_COND_IF(ARCH_IA32, [ - EFI_ARCH=ia32 - EFI_MACHINE_TYPE_NAME=ia32]) - -AM_COND_IF(ARCH_X86_64, [ - EFI_MACHINE_TYPE_NAME=x64]) - -AC_SUBST([EFI_ARCH]) -AC_SUBST([EFI_MACHINE_TYPE_NAME]) - -have_gnuefi=no -AC_ARG_ENABLE(gnuefi, AS_HELP_STRING([--enable-gnuefi], [Disable optional gnuefi support])) -AS_IF([test "x$enable_gnuefi" != "xno"], [ - AC_CHECK_HEADERS(efi/${EFI_ARCH}/efibind.h, - [AC_DEFINE(HAVE_GNUEFI, 1, [Define if gnuefi is available]) - have_gnuefi=yes], - [AS_IF([test "x$enable_gnuefi" = xyes], - [AC_MSG_ERROR([*** gnuefi support requested but headers not found])]) - ]) - - efiroot=$(echo $(cd /usr/lib/$(gcc -print-multi-os-directory); pwd)) - - EFI_LIB_DIR="$efiroot" - AC_ARG_WITH(efi-libdir, - AS_HELP_STRING([--with-efi-libdir=PATH], [Path to EFI lib directory]), - [EFI_LIB_DIR="$withval"], [EFI_LIB_DIR="$efiroot"] - ) - AC_SUBST([EFI_LIB_DIR]) - - have_efi_lds=no - AC_ARG_WITH(efi-ldsdir, - AS_HELP_STRING([--with-efi-ldsdir=PATH], [Path to EFI lds directory]), - [EFI_LDS_DIR="$withval" && AC_CHECK_FILE([${EFI_LDS_DIR}/elf_${EFI_ARCH}_efi.lds], - [have_efi_lds=yes])], - [AS_FOR([DIR], [EFI_LDS_DIR], ["${efiroot}/gnuefi" "${efiroot}"], - [AC_CHECK_FILE([${EFI_LDS_DIR}/elf_${EFI_ARCH}_efi.lds], - [have_efi_lds=yes && break])])]) - AS_IF([test "x$have_efi_lds" = xyes], - [AC_SUBST([EFI_LDS_DIR])], - [AS_IF([test "x$enable_gnuefi" = xyes], - [AC_MSG_ERROR([*** gnuefi support requested but files not found])], - [have_gnuefi=no])]) - - AC_ARG_WITH(efi-includedir, - AS_HELP_STRING([--with-efi-includedir=PATH], [Path to EFI include directory]), - [EFI_INC_DIR="$withval"], [EFI_INC_DIR="/usr/include"] - ) - AC_SUBST([EFI_INC_DIR]) -]) -AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes]) - # ------------------------------------------------------------------------------ have_kdbus=no AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default])) @@ -617,74 +525,8 @@ fi AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"]) # ------------------------------------------------------------------------------ -AC_ARG_WITH(rc-local-script-path-start, - AS_HELP_STRING([--with-rc-local-script-path-start=PATH], - [Path to /etc/rc.local]), - [RC_LOCAL_SCRIPT_PATH_START="$withval"], - [RC_LOCAL_SCRIPT_PATH_START="/etc/rc.local"]) - -AC_ARG_WITH(rc-local-script-path-stop, - AS_HELP_STRING([--with-rc-local-script-path-stop=PATH], - [Path to /usr/sbin/halt.local]), - [RC_LOCAL_SCRIPT_PATH_STOP="$withval"], - [RC_LOCAL_SCRIPT_PATH_STOP="/usr/sbin/halt.local"]) - -AC_DEFINE_UNQUOTED(RC_LOCAL_SCRIPT_PATH_START, ["$RC_LOCAL_SCRIPT_PATH_START"], [Path of /etc/rc.local script]) -AC_DEFINE_UNQUOTED(RC_LOCAL_SCRIPT_PATH_STOP, ["$RC_LOCAL_SCRIPT_PATH_STOP"], [Path of /usr/sbin/halt.local script]) - -AC_SUBST(RC_LOCAL_SCRIPT_PATH_START) -AC_SUBST(RC_LOCAL_SCRIPT_PATH_STOP) - -# ------------------------------------------------------------------------------ -AC_ARG_WITH(kbd-loadkeys, - AS_HELP_STRING([--with-kbd-loadkeys=PATH], - [Path to loadkeys]), - [KBD_LOADKEYS="$withval"], - [KBD_LOADKEYS="/usr/bin/loadkeys"]) - -AC_ARG_WITH(kbd-setfont, - AS_HELP_STRING([--with-kbd-setfont=PATH], - [Path to setfont]), - [KBD_SETFONT="$withval"], - [KBD_SETFONT="/usr/bin/setfont"]) - -AC_DEFINE_UNQUOTED(KBD_LOADKEYS, ["$KBD_LOADKEYS"], [Path of loadkeys]) -AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont]) - -AC_SUBST(KBD_LOADKEYS) -AC_SUBST(KBD_SETFONT) - -AC_ARG_WITH(telinit, - AS_HELP_STRING([--with-telinit=PATH], - [Path to telinit]), - [TELINIT="$withval"], - [TELINIT="/lib/sysvinit/telinit"]) - -AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit]) - -AC_SUBST(TELINIT) - AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h]) -# ------------------------------------------------------------------------------ -have_myhostname=no -AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support])) -if test "x$enable_myhostname" != "xno"; then - AC_HEADER_STDC - AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h sys/auxv.h]) - - AC_C_CONST - AC_TYPE_SIZE_T - AC_HEADER_TIME - - AC_FUNC_MALLOC - AC_FUNC_SELECT_ARGTYPES - AC_CHECK_FUNCS([gethostbyaddr gethostbyname gettimeofday inet_ntoa memset select socket strcspn strdup strerror strncasecmp strcasecmp strspn]) - - have_myhostname=yes -fi -AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"]) - # ------------------------------------------------------------------------------ AC_ARG_ENABLE([gudev], AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]), @@ -869,21 +711,9 @@ AC_MSG_RESULT([ SECCOMP: ${have_seccomp} SMACK: ${have_smack} ACL: ${have_acl} - resolved: ${have_resolved} - default DNS servers: ${DNS_SERVERS} - coredump: ${have_coredump} polkit: ${have_polkit} - efi: ${have_efi} - gnuefi: ${have_gnuefi} - efi arch: ${EFI_ARCH} - EFI machine type: ${EFI_MACHINE_TYPE_NAME} - EFI CC ${EFI_CC} - EFI libdir: ${EFI_LIB_DIR} - EFI ldsdir: ${EFI_LDS_DIR} - EFI includedir: ${EFI_INC_DIR} blkid: ${have_blkid} dbus: ${have_dbus} - nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} hwdb: ${enable_hwdb} kdbus: ${have_kdbus} @@ -918,8 +748,6 @@ AC_MSG_RESULT([ D-Bus system dir: ${with_dbussystemservicedir} Bash completions dir: ${with_bashcompletiondir} Zsh completions dir: ${with_zshcompletiondir} - Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} - Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP} TTY GID: ${TTY_GID} Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX}