X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=3fd51ce36e35b54b30ffeff598af8f965f0df65b;hp=eb22a5cb6119eed634f201f3c956a42ab56480dd;hb=662c3110803bd8c1aedacc36788e6fd028944314;hpb=e231a5db51f1b21252b2404d0aa2f243baa87a1a

diff --git a/configure.ac b/configure.ac
index eb22a5cb6..3fd51ce36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,31 @@
 AC_INIT([udev],
-	[126],
-	[kay.sievers@vrfy.org])
+	[141],
+	[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_PROG_LIBTOOL
+AC_CONFIG_MACRO_DIR([m4])
+
+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=2
+LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_AGE=2
+AC_SUBST(LIBUDEV_LT_CURRENT)
+AC_SUBST(LIBUDEV_LT_REVISION)
+AC_SUBST(LIBUDEV_LT_AGE)
 
 dnl /* libvolume_id version */
-VOLID_LT_CURRENT=0
-VOLID_LT_REVISION=86
-VOLID_LT_AGE=0
+VOLID_LT_CURRENT=2
+VOLID_LT_REVISION=0
+VOLID_LT_AGE=1
 AC_SUBST(VOLID_LT_CURRENT)
 AC_SUBST(VOLID_LT_REVISION)
 AC_SUBST(VOLID_LT_AGE)
@@ -23,10 +36,6 @@ AC_CHECK_LIB(c, inotify_init,
 	[AC_DEFINE([HAVE_INOTIFY], 1, [inotify available])],
 	[AC_MSG_WARN([inotify support disabled])])
 
-AC_CHECK_LIB(c, strlcpy,
-	[AC_DEFINE([HAVE_STRLCPY], 1, [strlcpy available])],
-	[])
-
 AC_ARG_WITH(udev-prefix,
 	AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
 	[], [with_udev_prefix='${exec_prefix}'])
@@ -49,7 +58,7 @@ if test "x$with_selinux" = xyes; then
 		AC_MSG_ERROR([SELinux selected but libselinux not found]))
 	LIBS=$LIBS_save
 	AC_DEFINE(USE_SELINUX, [1] ,[compile with SELinux support])
-	SELINUX_LIBS="-lselinux"
+	SELINUX_LIBS="-lselinux -lsepol"
 fi
 AC_SUBST([SELINUX_LIBS])
 AM_CONDITIONAL(USE_SELINUX, [test "x$with_selinux" = xyes], [compile with SELinux support])
@@ -74,6 +83,8 @@ AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
 	udev/Makefile
+	udev/lib/Makefile
+	udev/lib/libudev.pc
 	rules/Makefile
 	extras/Makefile
 	extras/ata_id/Makefile