git.tremily.us Git - gentoo.git/blob

   1 From ef596aeb01aac8d85fd5861cff360b93cc16ef16 Mon Sep 17 00:00:00 2001
   2 From: Timo Tambet <ttambet@gmail.com>
   3 Date: Sun, 26 Feb 2017 00:37:06 +0200
   4 Subject: [PATCH 3/4] Make network panel optional
   5
   6 Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
   7 [Updated for 3.23.90]
   8 Signed-off-by: Timo Tambet <ttambet@gmail.com>
   9 ---
  10  configure.ac | 43 +++++++++++++++++++++++++------------------
  11  1 file changed, 25 insertions(+), 18 deletions(-)
  12
  13 diff --git a/configure.ac b/configure.ac
  14 index edbf657f4..248db379e 100644
  15 --- a/configure.ac
  16 +++ b/configure.ac
  17 @@ -275,24 +275,31 @@ linux_usb_error_or_warn()
  18         esac
  19  }
  20
  21 -PKG_CHECK_MODULES(NETWORK_MANAGER,
  22 -                  libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
  23 -                  libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
  24 -                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
  25 -                  [have_networkmanager=yes], have_networkmanager=no)
  26 -if test "x$have_networkmanager" = xno ; then
  27 -        linux_error_or_warn "*** Network panel will not be built (NetworkManager or ModemManager not found) ***"
  28 -else
  29 -       AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
  30 -fi
  31 -AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
  32 -if test x${have_networkmanager} = xyes; then
  33 -  AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
  34 -  NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
  35 -  NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
  36 -  AC_SUBST(NM_VPN_CONFIG_DIR)
  37 -  AC_SUBST(NM_VPN_MODULE_DIR)
  38 -fi
  39 +AC_ARG_ENABLE([networkmanager],
  40 +              AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
  41 +              [],
  42 +              [enable_networkmanager=auto])
  43 +AS_IF([test "$enable_networkmanager" != "no"],
  44 +      [
  45 +        PKG_CHECK_MODULES(NETWORK_MANAGER,
  46 +                          libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
  47 +                          libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
  48 +                          mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
  49 +                          [have_networkmanager=yes], [have_networkmanager=no])
  50 +
  51 +        AS_IF([test "$have_networkmanager" = "no"],
  52 +              [
  53 +                AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
  54 +              ], [
  55 +                AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
  56 +                AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
  57 +                NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
  58 +                NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
  59 +                AC_SUBST([NM_VPN_CONFIG_DIR])
  60 +                AC_SUBST([NM_VPN_MODULE_DIR])
  61 +              ])
  62 +      ])
  63 +AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
  64
  65  # Check for power panel
  66  if test x${have_networkmanager} = xyes; then
  67 --
  68 2.11.1
  69