X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=377a27e59ed46408e4be8d49029fcf555ecf16cb;hp=4be3ed583a82dea65b6aa16c248116c761236a33;hb=61ee8cc92d5298da4fd4f46016991369a933ef7f;hpb=33a5cc297680f20e791c792a45fe949f715f5f69 diff --git a/configure.ac b/configure.ac index 4be3ed583..377a27e59 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT([udev], - [126], - [kay.sievers@vrfy.org]) + [136], + [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]) @@ -9,17 +9,21 @@ AC_DISABLE_STATIC AC_SYS_LARGEFILE AC_PROG_LIBTOOL +dnl /* prefix is /usr, exec_prefix in /, 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=0 +LIBUDEV_LT_REVISION=6 LIBUDEV_LT_AGE=0 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_CURRENT=1 +VOLID_LT_REVISION=7 VOLID_LT_AGE=0 AC_SUBST(VOLID_LT_CURRENT) AC_SUBST(VOLID_LT_REVISION) @@ -31,10 +35,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}']) @@ -57,7 +57,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])