X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=40f60431eb783322707d6806ca9c415439a3f263;hb=ec9259f0034043edd2878a22be7f7c86e18c70b4;hp=4ef10ac9103ba4790171f65412aa277e76e7a38a;hpb=3027205011edd137fd935b82e55dadd18a927216;p=elogind.git diff --git a/configure.ac b/configure.ac index 4ef10ac91..40f60431e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_INIT([elogind], [elogind], [http://www.freedesktop.org/wiki/Software/elogind]) -AC_CONFIG_SRCDIR([src/core/main.c]) +AC_CONFIG_SRCDIR([src/login/logind.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -87,19 +87,8 @@ AC_PROG_CC_C99 AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) -AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon], [$PATH:/usr/sbin:/sbin]) -AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck], [$PATH:/usr/sbin:/sbin]) - -AC_PATH_PROG([SETCAP], [setcap], [/usr/sbin/setcap], [$PATH:/usr/sbin:/sbin]) - -AC_PATH_PROG([KILL], [kill], [/usr/bin/kill], [$PATH:/usr/sbin:/sbin]) - -AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin]) -AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) - AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) M4_DEFINES= @@ -114,13 +103,6 @@ AS_IF([test "x$enable_gtk_doc" = "xyes" -a "x$XSLTPROC" = x], [ AC_MSG_ERROR([*** GTK doc requested but xsltproc not found]) ]) -m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ -GOBJECT_INTROSPECTION_CHECK([1.31.1]) -], [ - AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) - enable_introspection=no]) - -AC_CHECK_TOOL(STRINGS, strings) AC_CHECK_TOOL(GPERF, gperf) if test -z "$GPERF" ; then AC_MSG_ERROR([*** gperf not found]) @@ -243,7 +225,6 @@ AC_CHECK_SIZEOF(rlim_t,,[ # ------------------------------------------------------------------------------ -AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])]) AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])]) AC_CHECK_HEADERS([linux/btrfs.h], [], []) AC_CHECK_HEADERS([linux/memfd.h], [], []) @@ -257,12 +238,6 @@ AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not CAP_LIBS="$LIBS" AC_SUBST(CAP_LIBS) -LIBS= -AC_SEARCH_LIBS([mq_open], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])]) -RT_LIBS="$LIBS" -AC_SUBST(RT_LIBS) -LIBS="$save_LIBS" - AC_CHECK_FUNCS([memfd_create]) AC_CHECK_FUNCS([__secure_getenv secure_getenv]) AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN], @@ -316,15 +291,7 @@ AS_IF([test "x$enable_dbus" != "xno"], [ AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"]) # ------------------------------------------------------------------------------ -have_compat_libs=no -AC_ARG_ENABLE([compat_libs], AS_HELP_STRING([--enable-compat-libs],[Enable creation of compatibility libraries]), - [case "${enableval}" in - yes) have_compat_libs=yes ;; - no) have_compat_libs=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-compat-libs) ;; - esac], - [have_compat_libs=no]) -AM_CONDITIONAL([ENABLE_COMPAT_LIBS], [test "$have_compat_libs" = "yes"]) +PKG_CHECK_MODULES(UDEV, [libudev]) # ------------------------------------------------------------------------------ have_coverage=no @@ -349,22 +316,6 @@ if test "x$enable_coverage" = "xyes" ; then fi AM_CONDITIONAL(ENABLE_COVERAGE, [test "$have_coverage" = "yes"]) -# ------------------------------------------------------------------------------ -have_kmod=no -AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules support])) -if test "x$enable_kmod" != "xno"; then - PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no) - if test "x$have_kmod" = "xyes"; then - PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ], - [AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])], - AC_MSG_ERROR([*** kmod version >= 15 not found])) - fi - if test "x$have_kmod" = xno -a "x$enable_kmod" = xyes; then - AC_MSG_ERROR([*** kmod support requested, but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_KMOD, [test "$have_kmod" = "yes"]) - # ------------------------------------------------------------------------------ have_xkbcommon=no AC_ARG_ENABLE(xkbcommon, AS_HELP_STRING([--disable-xkbcommon], [disable xkbcommon keymap support])) @@ -389,15 +340,6 @@ if test "x$enable_blkid" != "xno"; then fi AM_CONDITIONAL(HAVE_BLKID, [test "$have_blkid" = "yes"]) -# ------------------------------------------------------------------------------ -have_libmount=no -PKG_CHECK_MODULES(MOUNT, [ mount >= 2.20 ], - [AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available]) have_libmount=yes], have_libmount=no) -if test "x$have_libmount" = xno; then - AC_MSG_ERROR([*** libmount support required but libraries not found]) -fi -AM_CONDITIONAL(HAVE_LIBMOUNT, [test "$have_libmount" = "yes"]) - # ------------------------------------------------------------------------------ have_seccomp=no AC_ARG_ENABLE(seccomp, AS_HELP_STRING([--disable-seccomp], [Disable optional SECCOMP support])) @@ -867,14 +809,6 @@ if test "x$enable_bootchart" != "xno"; then fi AM_CONDITIONAL(ENABLE_BOOTCHART, [test "$have_bootchart" = "yes"]) -# ------------------------------------------------------------------------------ -have_quotacheck=no -AC_ARG_ENABLE(quotacheck, AS_HELP_STRING([--disable-quotacheck], [disable quotacheck tools])) -if test "x$enable_quotacheck" != "xno"; then - have_quotacheck=yes -fi -AM_CONDITIONAL(ENABLE_QUOTACHECK, [test "$have_quotacheck" = "yes"]) - # ------------------------------------------------------------------------------ have_tmpfiles=no AC_ARG_ENABLE(tmpfiles, AS_HELP_STRING([--disable-tmpfiles], [disable tmpfiles support])) @@ -1433,7 +1367,6 @@ AC_MSG_RESULT([ binfmt: ${have_binfmt} vconsole: ${have_vconsole} bootchart: ${have_bootchart} - quotacheck: ${have_quotacheck} tmpfiles: ${have_tmpfiles} sysusers: ${have_sysusers} firstboot: ${have_firstboot} @@ -1462,15 +1395,12 @@ AC_MSG_RESULT([ EFI libdir: ${EFI_LIB_DIR} EFI ldsdir: ${EFI_LDS_DIR} EFI includedir: ${EFI_INC_DIR} - kmod: ${have_kmod} xkbcommon: ${have_xkbcommon} blkid: ${have_blkid} - libmount: ${have_libmount} dbus: ${have_dbus} nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} hwdb: ${enable_hwdb} - gintrospection: ${enable_introspection} terminal: ${have_terminal} kdbus: ${have_kdbus} Python: ${have_python} @@ -1480,7 +1410,6 @@ AC_MSG_RESULT([ test coverage: ${have_coverage} Split /usr: ${enable_split_usr} SysV compatibility: ${SYSTEM_SYSV_COMPAT} - compatibility libraries: ${have_compat_libs} ldconfig support: ${enable_ldconfig} hibernate support: ${enable_hibernate} extra debugging: ${enable_debug}