update TODO

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 357806a0f42ae889abec2c446437976cf9bb9e89..975e5fbfdb008a11c4041c854b427139500c4ff6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,17 @@
-AC_INIT([udev], [168], [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])])
+AC_INIT([udev],
+       [171],
+       [linux-hotplug@vger.kernel.org],
+       [udev],
+       [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html])
+AC_CONFIG_SRCDIR([udev/udevd.c])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax dist-bzip2 subdir-objects])
 AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_CONFIG_MACRO_DIR([m4])
+AM_SILENT_RULES([yes])
 LT_INIT
 AC_PROG_AWK
 GTK_DOC_CHECK(1.10)
@@ -75,10 +81,10 @@ AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
-AC_ARG_ENABLE([hwdb],
+AC_ARG_ENABLE([rule_generator],
        AS_HELP_STRING([--disable-rule_generator], [disable persistent network, cdrom support]),
        [], [enable_rule_generator=yes])
-AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_genarator" = xyes])
+AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes])
 
 # ------------------------------------------------------------------------------
 # usb/pci-db - read vendor/device string database
@@ -93,8 +99,18 @@ if test "x$enable_hwdb" = xyes; then
                AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
        fi
 
-       PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
-       AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+       AC_ARG_WITH(usb-ids-path,
+               [AS_HELP_STRING([--with-usb-ids-path=DIR], [Path to usb.ids file])],
+               [USB_DATABASE=${withval}],
+               [if test -n "$usbids" ; then
+                       USB_DATABASE="$usbids"
+               else
+                       PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
+                       AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+               fi])
+       AC_MSG_CHECKING([for USB database location])
+       AC_MSG_RESULT([$USB_DATABASE])
+       AC_SUBST(USB_DATABASE)
 
        AC_ARG_WITH(pci-ids-path,
                [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],
@@ -121,8 +137,6 @@ if test "x$enable_udev_acl" = xyes; then
        AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
 
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
-       AC_SUBST([GLIB_CFLAGS])
-       AC_SUBST([GLIB_LIBS])
 fi
 AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = xyes])
 
@@ -134,13 +148,11 @@ AC_ARG_ENABLE([gudev],
        [], [enable_gudev=yes])
 if test "x$enable_gudev" = xyes; then
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
-       AC_SUBST([GLIB_CFLAGS])
-       AC_SUBST([GLIB_LIBS])
 fi
 
 AC_ARG_ENABLE([introspection],
-       AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
-       [], [enable_introspection=yes])
+       AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
+       [], [enable_introspection=yes])
 if test "x$enable_introspection" = xyes; then
        PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
        AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
@@ -187,19 +199,6 @@ AC_ARG_ENABLE([edd],
        [], [enable_edd=no])
 AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = xyes])
 
-# ------------------------------------------------------------------------------
-# mobile-action-modeswitch - switch Mobile Action cables into serial mode
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([ACTION_MODESWITCH],
-       AS_HELP_STRING([--enable-action_modeswitch], [enable action modeswitch support]),
-       [], [enable_action_modeswitch=no])
-if test "x$enable_action_modeswitch" = xyes; then
-       PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
-       AC_SUBST(LIBUSB_CFLAGS)
-       AC_SUBST(LIBUSB_LIBS)
-fi
-AM_CONDITIONAL([ENABLE_ACTION_MODESWITCH], [test "x$enable_action_modeswitch" = xyes])
-
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
@@ -243,15 +242,14 @@ AC_MSG_RESULT([
        cflags:                 ${CFLAGS}
        ldflags:                ${LDFLAGS}
 
-       gintrospection:         ${enable_introspection}
        rule_generator:         ${enable_rule_generator}
        hwdb:                   ${enable_hwdb}
        udev_acl:               ${enable_udev_acl}
        gudev:                  ${enable_gudev}
+       gintrospection:         ${enable_introspection}
        keymap:                 ${enable_keymap}
        floppy:                 ${enable_floppy}
        edd:                    ${enable_edd}
-       action_modeswitch:      ${enable_action_modeswitch}
 
        usb.ids:                ${USB_DATABASE}
        pci.ids:                ${PCI_DATABASE}