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

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