udevadm: settle - add --exit-if-exists=<file>

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e0e01adba14c7db4eda811f2f4708c707df450c2..f1d008e000e5407d250d6655968b9546a7351dd9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,30 +1,26 @@
 AC_INIT([udev],
-       [132],
-       [kay.sievers@vrfy.org])
+       [143],
+       [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 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=4
-LIBUDEV_LT_AGE=0
+LIBUDEV_LT_CURRENT=4
+LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_AGE=4
 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=4
-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,
@@ -53,7 +49,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])
@@ -93,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
        ========
 
@@ -120,4 +113,4 @@ echo "
        ldflags:                ${LDFLAGS}
 
        xsltproc:               ${XSLTPROC}
-"
+])