Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 478204 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-7 / +18 lines)
Lines 224-236 Link Here
224
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
224
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
225
AC_SUBST(GDESKTOP_PREFIX)
225
AC_SUBST(GDESKTOP_PREFIX)
226
226
227
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
227
AC_ARG_ENABLE(network,
228
                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
228
       AC_HELP_STRING([--disable-network],
229
                  libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
229
               [disable network management panel]),
230
                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
230
       [case "${enableval}" in
231
                  libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
231
               yes) have_network=yes ;;
232
                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
232
               no) have_network=no ;;
233
                  [have_networkmanager=yes], have_networkmanager=no)
233
               *) AC_MSG_ERROR(bad value ${enableval} for --disable-network) ;;
234
       esac],
235
       [have_networkmanager=yes]) dnl Default value
236
if test "x$have_networkmanager" != xno; then
237
  PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
238
                    libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
239
                    libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
240
                    libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
241
                    libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
242
                    mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
243
                    [have_networkmanager=yes], have_networkmanager=no)
244
fi
234
if test "x$have_networkmanager" = xno ; then
245
if test "x$have_networkmanager" = xno ; then
235
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
246
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
236
else
247
else

Return to bug 478204