Fix building with --disable-extras

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4fcdbcd276015ee15240548abc15eeaf9dce45d1..c7885b01624b14113f39193cf3c18ec4ee2eb8e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [153], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [166], [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])])
@@ -12,6 +12,8 @@ GTK_DOC_CHECK(1.10)
 AC_PREFIX_DEFAULT([/usr])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
+AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([POSIX RT library not found])])
+
 AC_ARG_WITH([rootlibdir],
        AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]),
        [], [with_rootlibdir=$libdir])
@@ -46,6 +48,31 @@ if test "x$enable_logging" = "xyes"; then
        AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
 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"])
+OLD_IFS=$IFS
+IFS=:
+for i in $with_firmware_path
+do
+       if test "x${FIRMWARE_PATH}" = "x"; then
+               FIRMWARE_PATH="\\\"${i}/\\\""
+       else
+               FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\""
+       fi
+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)])
+if test "x$with_systemdsystemunitdir" != xno; then
+    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
+
 AC_ARG_ENABLE([extras],
        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
        [], [enable_extras=yes])
@@ -55,7 +82,7 @@ if test "x$enable_extras" = xyes; then
                AC_MSG_ERROR([gperf is needed])
        fi
 
-       PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
+       PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
        AC_SUBST([GLIB_CFLAGS])
        AC_SUBST([GLIB_LIBS])
 
@@ -69,44 +96,31 @@ 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_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"]
-               )
-       OLD_IFS=$IFS
-       IFS=:
-       for i in $with_firmware_path
-       do
-               if test "x${FIRMWARE_PATH}" = "x"
-               then
-                       FIRMWARE_PATH="\\\"${i}/\\\""
-               else
-                       FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\""
-               fi
-       done
-       IFS=$OLD_IFS
-       AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
-
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
        AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
+AC_CHECK_HEADER([linux/videodev.h], [have_videodev_h=yes], [])
+AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
+
 AC_ARG_ENABLE([introspection],
        AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
        [], [enable_introspection=yes])
@@ -124,10 +138,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
@@ -151,6 +168,8 @@ AC_MSG_RESULT([
 
        include_prefix:         ${INCLUDE_PREFIX}
 
+       systemdsystemunitdir:   ${systemdsystemunitdir}
+
        logging:                ${enable_logging}
        debug:                  ${enable_debug}
        selinux:                ${with_selinux}