X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=85e75d783b2a2775855a55edb8c68e26f09cb285;hb=e37d55fe7ba075068d8814da3c695b9c5c2e63f3;hp=568d56c95f9745a3daf7c9fd79033e7b8036d600;hpb=96408316212ad291aa1986a1bc91e682404cdb04;p=elogind.git diff --git a/configure.ac b/configure.ac index 568d56c95..85e75d783 100644 --- a/configure.ac +++ b/configure.ac @@ -372,15 +372,6 @@ if test "x$enable_apparmor" != "xno"; then fi AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"]) - -AC_ARG_WITH([certificate-root], - AS_HELP_STRING([--with-certificate-root=PATH], - [Specify the prefix for TLS certificates [/etc/ssl]]), - [CERTIFICATEROOT="$withval"], - [CERTIFICATEROOT="/etc/ssl"]) - -AC_SUBST(CERTIFICATEROOT) - # ------------------------------------------------------------------------------ AC_ARG_ENABLE([pam], AS_HELP_STRING([--disable-pam],[Disable optional PAM support]), @@ -528,17 +519,9 @@ AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"]) AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h]) # ------------------------------------------------------------------------------ -AC_ARG_ENABLE([gudev], - AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]), - [], [enable_gudev=yes]) -AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ]) -AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"]) -AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ]) - -# ------------------------------------------------------------------------------ -AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])], - enable_hwdb=$enableval, enable_hwdb=yes) -AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0], + [have_glib=yes], [have_glib=no]) +AS_IF([test "x$have_glib" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ]) # ------------------------------------------------------------------------------ have_manpages=no @@ -547,28 +530,8 @@ AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) # ------------------------------------------------------------------------------ -AC_ARG_ENABLE(hibernate, - [AC_HELP_STRING([--disable-hibernate], [disable hibernation support])], - enable_hibernate=$enableval, enable_hibernate=yes) -AM_CONDITIONAL(ENABLE_HIBERNATE, [test x$enable_hibernate = xyes]) - -# ------------------------------------------------------------------------------ -AC_ARG_ENABLE(ldconfig, - [AC_HELP_STRING([--disable-ldconfig], [disable ldconfig])], - enable_ldconfig=$enableval, enable_ldconfig=yes) -AM_CONDITIONAL(ENABLE_LDCONFIG, [test x$enable_ldconfig = xyes]) - AC_SUBST(M4_DEFINES) -AC_ARG_WITH([tty-gid], - [AS_HELP_STRING([--with-tty-gid=GID], - [Specify the numeric GID of the 'tty' group])], - [TTY_GID="$withval"], - [TTY_GID="5"]) - -AC_DEFINE_UNQUOTED(TTY_GID, [$TTY_GID], [GID of the 'tty' group]) -AC_SUBST(TTY_GID) - AC_ARG_WITH([dbuspolicydir], AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]), [], @@ -625,14 +588,6 @@ AC_ARG_ENABLE([split-usr], enable_split_usr=no ])]) -AC_ARG_WITH([dkr-index-url], - [AS_HELP_STRING([--dkr-index-url=URL], [Specify the default index URL to use for image downloads])], - [DEFAULT_DKR_INDEX_URL="\"$withval\""], - [DEFAULT_DKR_INDEX_URL="NULL"]) - -AC_DEFINE_UNQUOTED(DEFAULT_DKR_INDEX_URL, [$DEFAULT_DKR_INDEX_URL], [Default index URL to use for image downloads]) -AC_SUBST(DEFAULT_DKR_INDEX_URL) - AS_IF([test "x${enable_split_usr}" = "xyes"], [ AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr]) ]) @@ -644,14 +599,6 @@ AS_IF([test "x$0" != "x./configure"], [ AC_SUBST([INTLTOOL_UPDATE], [/bin/true]) ]) -# QEMU and OVMF UEFI firmware -AS_IF([test x"$cross_compiling" = "xyes"], [], [ - AC_PATH_PROG([QEMU], [qemu-system-x86_64]) - AC_CHECK_FILE([/usr/share/qemu/bios-ovmf.bin], [QEMU_BIOS=/usr/share/qemu/bios-ovmf.bin], - [AC_CHECK_FILE([/usr/share/qemu-ovmf/bios.bin], [QEMU_BIOS=/usr/share/qemu-ovmf/bios.bin])]) - AC_SUBST([QEMU_BIOS]) -]) - AC_ARG_ENABLE(tests, [AC_HELP_STRING([--disable-tests], [disable tests])], enable_tests=$enableval, enable_tests=yes) @@ -714,18 +661,12 @@ AC_MSG_RESULT([ polkit: ${have_polkit} blkid: ${have_blkid} dbus: ${have_dbus} - gudev: ${enable_gudev} - hwdb: ${enable_hwdb} kdbus: ${have_kdbus} - Python: ${have_python} - Python Headers: ${have_python_devel} man pages: ${have_manpages} gtk-doc: ${enable_gtk_doc} test coverage: ${have_coverage} Split /usr: ${enable_split_usr} SysV compatibility: ${SYSTEM_SYSV_COMPAT} - ldconfig support: ${enable_ldconfig} - hibernate support: ${enable_hibernate} extra debugging: ${enable_debug} prefix: ${prefix} @@ -738,9 +679,6 @@ AC_MSG_RESULT([ rootlib dir: ${with_rootlibdir} SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} - Build Python: ${PYTHON} - Installation Python: ${PYTHON_BINARY} - sphinx binary: ${SPHINX_BUILD} PAM modules dir: ${with_pamlibdir} PAM configuration dir: ${with_pamconfdir} D-Bus policy dir: ${with_dbuspolicydir} @@ -748,15 +686,10 @@ AC_MSG_RESULT([ D-Bus system dir: ${with_dbussystemservicedir} Bash completions dir: ${with_bashcompletiondir} Zsh completions dir: ${with_zshcompletiondir} - TTY GID: ${TTY_GID} Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX} - Certificate root: ${CERTIFICATEROOT} - Default dkr Index ${DEFAULT_DKR_INDEX_URL} CFLAGS: ${OUR_CFLAGS} ${CFLAGS} CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} LDFLAGS: ${OUR_LDFLAGS} ${LDFLAGS} - PYTHON_CFLAGS: ${PYTHON_DEVEL_CFLAGS} - PYTHON_LIBS: ${PYTHON_DEVEL_LIBS} ])