X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=119bbb7859392c871e149a7f934ce55be1fdc546;hp=377a27e59ed46408e4be8d49029fcf555ecf16cb;hb=3de63a356f5a3dd34c8404e9775389389547d6d1;hpb=109d114578a785c33fae01af2bea4ea88dda3def

diff --git a/configure.ac b/configure.ac
index 377a27e59..119bbb785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,34 +1,26 @@
 AC_INIT([udev],
-	[136],
+	[142],
 	[linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([udev/udevd.c])
 AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
-AC_GNU_SOURCE
 AC_DISABLE_STATIC
+AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
 
-dnl /* prefix is /usr, exec_prefix in /, if overridden exec_prefix follows prefix */
+dnl /* prefix is /usr, exec_prefix is /, if overridden exec_prefix follows prefix */
 AC_PREFIX_DEFAULT([/usr])
 test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix=
 
 dnl /* libudev version */
-LIBUDEV_LT_CURRENT=0
-LIBUDEV_LT_REVISION=6
-LIBUDEV_LT_AGE=0
+LIBUDEV_LT_CURRENT=3
+LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_AGE=3
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)
 AC_SUBST(LIBUDEV_LT_AGE)
 
-dnl /* libvolume_id version */
-VOLID_LT_CURRENT=1
-VOLID_LT_REVISION=7
-VOLID_LT_AGE=0
-AC_SUBST(VOLID_LT_CURRENT)
-AC_SUBST(VOLID_LT_REVISION)
-AC_SUBST(VOLID_LT_AGE)
-
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 AC_CHECK_LIB(c, inotify_init,
@@ -97,13 +89,10 @@ AC_CONFIG_FILES([
 	extras/rule_generator/Makefile
 	extras/scsi_id/Makefile
 	extras/usb_id/Makefile
-	extras/volume_id/Makefile
-	extras/volume_id/lib/Makefile
-	extras/volume_id/lib/libvolume_id.pc
 ])
-AC_OUTPUT
 
-echo "
+AC_OUTPUT
+AC_MSG_RESULT([
 	udev $VERSION
 	========
 
@@ -124,4 +113,4 @@ echo "
 	ldflags:		${LDFLAGS}
 
 	xsltproc:		${XSLTPROC}
-"
+])