Makefile: add tar-sync

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a2a042ba60761018fb0f61693755466c6c3b3b8d..d8388883d5384890d8af8d482a23829457ebdcfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [168], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [171], [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_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])


@@ -75,10 +75,10 @@ AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # 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])
        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
 
 # ------------------------------------------------------------------------------
 # usb/pci-db - read vendor/device string database


@@ -93,8 +93,18 @@ if test "x$enable_hwdb" = xyes; then
                AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
        fi
 
                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])],
 
        AC_ARG_WITH(pci-ids-path,
                [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],


@@ -136,14 +146,22 @@ 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])
        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])
+if test "x$enable_introspection" = xyes; then

        PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
        PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])

+       AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])

        AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
        AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)])
        AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)])
        AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)])
        AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)])
 fi
        AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
        AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)])
        AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)])
        AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)])
        AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)])
 fi

+AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
+

 AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
 
 # ------------------------------------------------------------------------------
 AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
 
 # ------------------------------------------------------------------------------


@@ -182,7 +200,7 @@ AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = xyes])
 # ------------------------------------------------------------------------------
 # mobile-action-modeswitch - switch Mobile Action cables into serial mode
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # mobile-action-modeswitch - switch Mobile Action cables into serial mode
 # ------------------------------------------------------------------------------

-AC_ARG_ENABLE([ACTION_MODESWITCH],
+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
        AS_HELP_STRING([--enable-action_modeswitch], [enable action modeswitch support]),
        [], [enable_action_modeswitch=no])
 if test "x$enable_action_modeswitch" = xyes; then


@@ -239,6 +257,7 @@ AC_MSG_RESULT([
        hwdb:                   ${enable_hwdb}
        udev_acl:               ${enable_udev_acl}
        gudev:                  ${enable_gudev}
        hwdb:                   ${enable_hwdb}
        udev_acl:               ${enable_udev_acl}
        gudev:                  ${enable_gudev}

+       gintrospection:         ${enable_introspection}

        keymap:                 ${enable_keymap}
        floppy:                 ${enable_floppy}
        edd:                    ${enable_edd}
        keymap:                 ${enable_keymap}
        floppy:                 ${enable_floppy}
        edd:                    ${enable_edd}