60-persistent-storage-tape.rules: make own by-path symlink for nst tapes

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 816769f111f1b1f2ad907648f930ea25f59f82af..b9b1b0b6360518f0d14141f5e9808764b4c6f86a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [155], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [160], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -49,8 +49,7 @@ fi
 AC_ARG_WITH(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
           [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]),
-       [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"]
-       )
+       [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"])
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path
@@ -64,6 +63,12 @@ done
 IFS=$OLD_IFS
 AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 
+AC_ARG_WITH([systemdsystemunitdir],
+       AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+       [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+
 AC_ARG_ENABLE([extras],
        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
        [], [enable_extras=yes])
@@ -87,17 +92,21 @@ if test "x$enable_extras" = xyes; then
        PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
        AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
 
-       AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
-       AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
-       AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
+       if test "x$cross_compiling" = "xno" ; then
+               AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
+               AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
+               AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
+       fi
        AC_ARG_WITH(pci-ids-path,
-               AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file]),
+               [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],
                [PCI_DATABASE=${withval}],
                [if test -n "$pciids" ; then
                        PCI_DATABASE="$pciids"
                else
                        AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
                fi])
+       AC_MSG_CHECKING([for PCI database location])
+       AC_MSG_RESULT([$PCI_DATABASE])
        AC_SUBST(PCI_DATABASE)
 
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
@@ -122,10 +131,13 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
+       udev/udev.pc
+       init/udev.service
+       init/udev-settle.service
+       init/udev-retry.service
        libudev/libudev.pc
        libudev/docs/Makefile
        libudev/docs/version.xml
-       udev/udev.pc
        extras/gudev/gudev-1.0.pc
        extras/gudev/docs/Makefile
        extras/gudev/docs/version.xml
@@ -149,6 +161,8 @@ AC_MSG_RESULT([
 
        include_prefix:         ${INCLUDE_PREFIX}
 
+       systemdsystemunitdir:   ${systemdsystemunitdir}
+
        logging:                ${enable_logging}
        debug:                  ${enable_debug}
        selinux:                ${with_selinux}