X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=f0d5d0407644745f5b77c2ce2e47261044b81f28;hp=df8d76d28cb5506ffc86e8b3b40da0f62bff544e;hb=95de03a7a20e02f06d2bbe8350f1b5e89af02790;hpb=12a362be5c1982f80dbfb75bda070208a2c99cdf

diff --git a/configure.ac b/configure.ac
index df8d76d28..f0d5d0407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,13 +6,15 @@ AC_INIT([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 no-dist-gzip 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,20 +204,10 @@ AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = "xyes"])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
-	extras/mtd_probe/75-probe_mtd.rules
-	rules/rules.d/80-drivers.rules
-	rules/rules.d/60-persistent-storage.rules
-	udev/udev.pc
-	systemd/udev.service
-	systemd/udev-trigger.service
-	systemd/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
-	extras/keymap/keyboard-force-release.sh
 ])
 
 AC_OUTPUT
@@ -224,7 +218,7 @@ AC_MSG_RESULT([
 	prefix:			${prefix}
 	sysconfdir:		${sysconfdir}
 	bindir:			${bindir}
-	sbindir:		${bindir}
+	sbindir:		${sbindir}
 	libdir:			${libdir}
 	rootlibdir:		${rootlib_execdir}
 	libexecdir:		${libexecdir}