chiark / gitweb /
configure: reorder options
[elogind.git] / configure.ac
index fe96846..dd071a9 100644 (file)
@@ -79,20 +79,30 @@ fi
 AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
 
 # ------------------------------------------------------------------------------
-# rule_generator - persistent network and optical device rule generator
+# GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
-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_generator" = xyes])
+AC_ARG_ENABLE([gudev],
+       AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support]),
+       [], [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])
+fi
 
-# ------------------------------------------------------------------------------
-# mtd_probe - autoloads FTL module for mtd devices
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([mtd_probe],
-       AS_HELP_STRING([--disable-mtd_probe], [disable MTD support]),
-       [], [enable_mtd_probe=yes])
-AM_CONDITIONAL([ENABLE_MTD_PROBE], [test "x$enable_mtd_probe" = xyes])
+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])
+       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
+AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
+
+AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
 
 # ------------------------------------------------------------------------------
 # usb/pci-db - read vendor/device string database
@@ -135,32 +145,6 @@ fi
 AM_CONDITIONAL([ENABLE_HWDB], [test "x$enable_hwdb" = xyes])
 
 # ------------------------------------------------------------------------------
-# GUdev - libudev gobject interface
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([gudev],
-       AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support]),
-       [], [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])
-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])
-       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
-AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
-
-AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
-
-# ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([keymap],
@@ -178,6 +162,22 @@ fi
 AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = xyes])
 
 # ------------------------------------------------------------------------------
+# mtd_probe - autoloads FTL module for mtd devices
+# ------------------------------------------------------------------------------
+AC_ARG_ENABLE([mtd_probe],
+       AS_HELP_STRING([--disable-mtd_probe], [disable MTD support]),
+       [], [enable_mtd_probe=yes])
+AM_CONDITIONAL([ENABLE_MTD_PROBE], [test "x$enable_mtd_probe" = xyes])
+
+# ------------------------------------------------------------------------------
+# rule_generator - persistent network and optical device rule generator
+# ------------------------------------------------------------------------------
+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_generator" = xyes])
+
+# ------------------------------------------------------------------------------
 # udev_acl - apply ACLs for users with local forground sessions
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([udev_acl],
@@ -233,36 +233,32 @@ AC_MSG_RESULT([
        libdir:                 ${libdir}
        rootlibdir:             ${rootlib_execdir}
        libexecdir:             ${libexecdir}
-
        datarootdir:            ${datarootdir}
        mandir:                 ${mandir}
        includedir:             ${includedir}
-
        include_prefix:         ${INCLUDE_PREFIX}
-
        systemdsystemunitdir:   ${systemdsystemunitdir}
-
-       logging:                ${enable_logging}
-       debug:                  ${enable_debug}
-       selinux:                ${with_selinux}
+       firmware path:          ${FIRMWARE_PATH}
 
        compiler:               ${CC}
        cflags:                 ${CFLAGS}
        ldflags:                ${LDFLAGS}
+       xsltproc:               ${XSLTPROC}
+       gperf:                  ${GPERF}
+
+       logging:                ${enable_logging}
+       debug:                  ${enable_debug}
+       selinux:                ${with_selinux}
 
-       rule_generator:         ${enable_rule_generator}
-       hwdb:                   ${enable_hwdb}
-       udev_acl:               ${enable_udev_acl}
        gudev:                  ${enable_gudev}
        gintrospection:         ${enable_introspection}
        keymap:                 ${enable_keymap}
+       hwdb:                   ${enable_hwdb}
+         usb.ids:              ${USB_DATABASE}
+         pci.ids:              ${PCI_DATABASE}
+       mtd_probe:              ${enable_mtd_probe}
+       rule_generator:         ${enable_rule_generator}
+       udev_acl:               ${enable_udev_acl}
        floppy:                 ${enable_floppy}
        edd:                    ${enable_edd}
-
-       usb.ids:                ${USB_DATABASE}
-       pci.ids:                ${PCI_DATABASE}
-       firmware path:          ${FIRMWARE_PATH}
-
-       xsltproc:               ${XSLTPROC}
-       gperf:                  ${GPERF}
 ])