rules: switch to built-in blkid

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 511d3b8e36caaa9cd564fac1db29869e18f11c11..86389fc410845acad8a4d443a2974ca77a232dc7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,20 @@
 AC_PREREQ(2.60)
 AC_INIT([udev],
-       [174],
+       [175],
        [linux-hotplug@vger.kernel.org],
        [udev],
        [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html])
 AC_CONFIG_SRCDIR([udev/udevd.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax dist-xz subdir-objects])
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_CONFIG_MACRO_DIR([m4])
 AM_SILENT_RULES([yes])
 LT_INIT([disable-static])
 AC_PROG_AWK
+AC_PROG_SED
+AC_PROG_MKDIR_P
 GTK_DOC_CHECK(1.10)
 AC_PREFIX_DEFAULT([/usr])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
@@ -71,6 +73,8 @@ AC_ARG_WITH([systemdsystemunitdir],
 AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ])
 AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ])
 
+PKG_CHECK_MODULES(BLKID, blkid >= 2.20)
+
 # ------------------------------------------------------------------------------
 # GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
@@ -200,14 +204,8 @@ AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = "xyes"])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
-       udev/udev.pc
-       init/udev.service
-       init/udev-trigger.service
-       init/udev-settle.service
-       libudev/libudev.pc
        libudev/docs/Makefile
        libudev/docs/version.xml
-       extras/gudev/gudev-1.0.pc
        extras/gudev/docs/Makefile
        extras/gudev/docs/version.xml
 ])
@@ -219,6 +217,7 @@ AC_MSG_RESULT([
 
        prefix:                 ${prefix}
        sysconfdir:             ${sysconfdir}
+       bindir:                 ${bindir}
        sbindir:                ${sbindir}
        libdir:                 ${libdir}
        rootlibdir:             ${rootlib_execdir}