rules: make RFKILL control device world readable

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0ec8e204e3b03406eed6dd06ed55ac94048301a4..9857d52e4efa3aa538ba0214c73500490b261506 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,28 @@
-AC_INIT(udev,
-       126,
-       kay.sievers@vrfy.org)
-
+AC_INIT([udev],
+       [143],
+       [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR(udev/udevd.c)
-AM_INIT_AUTOMAKE([check-news foreign -Wall 1.9 dist-bzip2])
-AC_GNU_SOURCE
+AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
 AC_DISABLE_STATIC
+AC_USE_SYSTEM_EXTENSIONS
+dnl AM_SILENT_RULES
 AC_SYS_LARGEFILE
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
 
-dnl /* libvolume_id version */
-VOLID_LT_CURRENT=0
-VOLID_LT_REVISION=86
-VOLID_LT_AGE=0
-AC_SUBST(VOLID_LT_CURRENT)
-AC_SUBST(VOLID_LT_REVISION)
-AC_SUBST(VOLID_LT_AGE)
-
-AC_PATH_PROG([XSLTPROC], [xsltproc])
+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=
 
-AC_CHECK_LIB(c, inotify_init,
-       [AC_DEFINE([HAVE_INOTIFY], 1, [inotify available])],
-       [AC_MSG_WARN([inotify support disabled])])
+dnl /* libudev version */
+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)
 
-AC_CHECK_LIB(c, strlcpy,
-       [AC_DEFINE([HAVE_STRLCPY], 1, [strlcpy available])],
-       [])
+AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 AC_ARG_WITH(udev-prefix,
        AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
@@ -50,7 +46,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])
@@ -75,6 +71,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
@@ -88,13 +86,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
        ========
 
@@ -115,4 +110,4 @@ echo "
        ldflags:                ${LDFLAGS}
 
        xsltproc:               ${XSLTPROC}
-"
+])