diff options
author | Eric Koegel <eric.koegel@gmail.com> | 2017-07-07 11:05:07 +0300 |
---|---|---|
committer | Eric Koegel <eric.koegel@gmail.com> | 2017-07-07 18:40:00 +0300 |
commit | 9d8ffacfaa6cf9e68aada2e4bf4bb764069caab1 (patch) | |
tree | 8ce513a7e838e92153a749711df4a5bcae2c024f | |
parent | 885809124c91da65c44deddb077b5925d6261c22 (diff) | |
download | ConsoleKit2-9d8ffacfaa6cf9e68aada2e4bf4bb764069caab1.tar.gz |
fix: Change configure.ac to enable the udev backend with devattr
And print out which session controller backend we're using.
-rw-r--r-- | configure.ac | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 35e2c4d..1d93a8a 100644 --- a/configure.ac +++ b/configure.ac @@ -326,15 +326,34 @@ AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = "xyes"]) # DragonFly BSD supplies devattr, we already checked for the header above # make sure we can find the lib -AC_CHECK_LIB([devattr], [udev_device_unref]) -AC_CHECK_LIB([prop], [prop_dictionary_get_cstring]) +have_devattr=no +AC_CHECK_LIB([devattr], [udev_device_unref], [ + LIBS="$LIBS -ldevattr" + have_devattr=yes + ]) + +have_libprop=no +AC_CHECK_LIB([prop], [prop_dictionary_get_cstring], [ + LIBS="$LIBS -lprop" + have_libprop=yes + ]) + + +use_udev=no +if test ["x$LIBUDEV_FOUND" = "xyes" -a "x$LIBDRM_FOUND" = "xyes"]; then + use_udev=yes +fi +if test ["$have_devattr" = "yes" -a "$have_libprop" = "yes"]; then + use_udev=yes +fi + -# we need both udev and libdrm for udev support -AS_IF([test "x$LIBUDEV_FOUND" = "xyes" -a "x$LIBDRM_FOUND" = "xyes"], [ - AC_DEFINE([USE_UDEV_BACKEND], [1], [Define if we have libudev and libdrm]) +# we need both udev/devattr and libdrm for udev support +AS_IF(test ["$use_udev" = "yes"], [ + AC_DEFINE([USE_UDEV_BACKEND], [1], [Define if we meet requirements to use the udev backend]) ]) -AM_CONDITIONAL([USE_UDEV_BACKEND], [test "x$LIBUDEV_FOUND" = "xyes" -a "x$LIBDRM_FOUND" = "xyes"]) +AM_CONDITIONAL([USE_UDEV_BACKEND], [test ["$use_udev" = "yes"]]) AC_SUBST(USE_UDEV_BACKEND) @@ -580,6 +599,12 @@ else echo " libdrm support no" fi +if test "$use_udev" = "yes"; then +echo " session controller udev" +else +echo " session controller none" +fi + if test x"$POLKIT_FOUND" = x"yes"; then echo " SELinux support: yes" else |