From 1f2349ee0b07244cec2fa721a15e7ff22344a044 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 29 Sep 2010 19:51:28 +0900 Subject: [PATCH] Sort enable configure option before the disable ones --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 74c8fc28..f34b9d47 100644 --- a/configure.ac +++ b/configure.ac @@ -102,6 +102,16 @@ else fi AC_SUBST(DBUS_CONFDIR) +AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng], + [enable capabilities support]), [enable_capng=${enableval}]) +if (test "${enable_capng}" = "yes"); then + PKG_CHECK_MODULES(CAPNG, libcap-ng, dummy=yes, + AC_MSG_ERROR(Capabilities library is required)) + AC_SUBST(CAPNG_CFLAGS) + AC_SUBST(CAPNG_LIBS) + AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) +fi + AC_ARG_ENABLE(udev, AC_HELP_STRING([--disable-udev], [don't use udev support even if available]), [enable_udev=${enableval}]) @@ -120,16 +130,6 @@ AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes") -AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng], - [enable capabilities support]), [enable_capng=${enableval}]) -if (test "${enable_capng}" = "yes"); then - PKG_CHECK_MODULES(CAPNG, libcap-ng, dummy=yes, - AC_MSG_ERROR(Capabilities library is required)) - AC_SUBST(CAPNG_CFLAGS) - AC_SUBST(CAPNG_LIBS) - AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) -fi - AC_ARG_ENABLE(isimodem, AC_HELP_STRING([--disable-isimodem], [disable PhoNet/ISI modem support]), [enable_isimodem=${enableval}])