chore: more autotools cleanup work

2 files changed, 39 insertions, 40 deletions

diff --git a/configure.ac b/configure.ac
index 1325301..525cf62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,8 @@ m4_define([x11_minimum_version], [1.0.0])
 m4_define([polkit_minimum_version], [0.92])
 m4_define([cgmanager_minimum_version], [0.0.0])
 m4_define([libevdev_minimum_version], [0.2])
+m4_define([libdrm_minimum_version], [2.4.60])
+m4_define([libudev_minimum_version], [190])
 m4_define([selinux_minimum_version], [1.0])
 
 AC_CHECK_HEADERS([unistd.h paths.h sys/vt.h sys/consio.h fcntl.h limits.h \
@@ -280,6 +282,16 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBEVDEV], [libevdev], [libevdev_minimum_version],
     [libevdev],
     [libevdev - for device management with a sessions controller])
 
+# libdrm - for device management with a session controller
+XDT_CHECK_OPTIONAL_PACKAGE([LIBDRM], [libdrm], [libdrm_minimum_version],
+    [libdrm],
+    [libdrm - for device management with a sessions controller])
+
+# libudev - use udev as a device manager for ck-device-udev.c
+XDT_CHECK_OPTIONAL_PACKAGE([LIBUDEV], [libudev], [libudev_minimum_version],
+    [libudev],
+    [libudev - use udev as a device manager for ck-device-udev.c])
+
 # selinux
 XDT_CHECK_OPTIONAL_PACKAGE([SELINUX], [libselinux], [selinux_minimum_version], [libselinux],
                            [Security-Enhanced Linux support])
@@ -304,46 +316,22 @@ AS_IF([test "x$enable_udev_acl" = "xyes"], [
 ])
 AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = "xyes"])
 
-# libudev - use udev as a device manager for ck-device-udev.c
-have_libudev=no
-AC_ARG_ENABLE([libudev],
-  AS_HELP_STRING([--enable-libudev], [Enable udev support @<:@default=auto@:>@]),
-  [enable_libudev=$enableval],
-  [enable_libudev=auto])
-AS_IF([test "x$enable_libudev" != "xno"], [
-  PKG_CHECK_MODULES([LIBUDEV], [libudev], [have_libudev=yes], [have_libudev=no])
-  PKG_CHECK_MODULES([LIBDRM], [libdrm], [have_libdrm=yes], [have_libdrm=no])
-  AC_CHECK_LIB([prop], [prop_dictionary_get_cstring], [have_libprop=yes], [have_libprop=no])
-  if test "x$have_libudev"  = "xno"; then
-    # 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], [have_libudev=yes], [have_libudev=no])
-    if test "x$have_libudev"  = "xyes"; then
-	LIBUDEV_LIBS="$LIBUDEV_LIBS -ldevattr"
-    fi
-  fi
-
-  if test "x$have_libprop"  = "xyes"; then
-    LIBUDEV_LIBS="$LIBUDEV_LIBS -lprop"
-  fi
-
-  if test "x$enable_libudev"  = "xyes" -a "x$have_libudev" = "xno"; then
-    AC_MSG_ERROR([udev support explicitly requested but dependencies not found])
-  fi
-])
+
+
+
+# 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])
+
+
 # we need both udev and libdrm for udev support
-AS_IF([test "x$have_libudev" = "xyes" -a "x$have_libdrm" = "xyes"], [
-  AC_DEFINE([HAVE_LIBUDEV], [], [Define if we have libudev])
+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])
 ])
-AM_CONDITIONAL([HAVE_LIBUDEV], [test "x$have_libudev" = "xyes" -a "x$have_libdrm" = "xyes"])
-AC_SUBST(HAVE_LIBUDEV)
+AM_CONDITIONAL([USE_UDEV_BACKEND], [test "x$LIBUDEV_FOUND" = "xyes" -a "x$LIBDRM_FOUND" = "xyes"])
+AC_SUBST(USE_UDEV_BACKEND)
 
-# but we may only require libdrm alone for a future device backend
-AS_IF([test "x$have_libdrm" = "xyes"], [
-  AC_DEFINE([HAVE_LIBDRM], [], [Define if we have libdrm])
-])
-AM_CONDITIONAL([HAVE_LIBDRM], [test "x$have_libdrm" = "xyes"])
-AC_SUBST(HAVE_LIBDRM)
 
 
 dnl ---------------------------------------------------------------------------
@@ -561,8 +549,13 @@ echo "
         Build backend:            ${CK_BACKEND}
         PAM module dir:           ${PAM_MODULE_DIR}
         Build PAM module:         ${msg_pam_module}
-        Build udev-acl:           ${enable_udev_acl}
-	udev support:             ${have_libudev}"
+        Build udev-acl:           ${enable_udev_acl}"
+
+if test x"$LIBUDEV_FOUND" = x"yes"; then
+echo "        udev support              yes"
+else
+echo "        udev support              no"
+fi
 
 if test x"$CGMANAGER_FOUND" = x"yes"; then
 echo "        cgroup support            yes"
@@ -576,6 +569,12 @@ else
 echo "        libevdev support          no"
 fi
 
+if test x"$LIBDRM_FOUND" = x"yes"; then
+echo "        libdrm support            yes"
+else
+echo "        libdrm support            no"
+fi
+
 if test x"$POLKIT_FOUND" = x"yes"; then
 echo "        SELinux support:          yes"
 else
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e342ef..bb7d54f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -203,7 +203,7 @@ endif
 
 console_kit_daemon_SOURCES += $(FILE_MONITOR_BACKEND)
 
-if HAVE_LIBUDEV
+if USE_UDEV_BACKEND
 console_kit_daemon_SOURCES += \
 	ck-device-udev.c \
 	$(NULL)