applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: make ModemManager dependency optional

Browse source 
There probably won't be a stable ModemManager 0.7 release before GNOME
3.8, so make support for it optional

(Mostly based on Aleksander's original patch.)

https://bugzilla.gnome.org/show_bug.cgi?id=688238
This commit is contained in:
Dan Winship 2013-02-13 13:02:14 -05:00
parent 99dd4951e6
commit 4ef8ae4017
4 changed files with 55 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -101,7 +101,6 @@ POLKIT_REQUIRED_VERSION=0.103
GSD_REQUIRED_VERSION=3.7.3
NETWORK_MANAGER_REQUIRED_VERSION=0.9.7.995
NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.7.995
MODEM_MANAGER_REQUIRED_VERSION=0.7
LIBNOTIFY_REQUIRED_VERSION=0.7.3
GNOME_DESKTOP_REQUIRED_VERSION=3.7.5
SCHEMAS_REQUIRED_VERSION=3.7.2.2
@ -185,11 +184,10 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_V
libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION,
[have_networkmanager=yes], have_networkmanager=no)
if test "x$have_networkmanager" = xno ; then
AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
AC_MSG_WARN(*** Network panel will not be built (NetworkManager not found) ***)
else
AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
fi
@ -202,6 +200,16 @@ if test x${have_networkmanager} = xyes; then
AC_SUBST(NM_VPN_MODULE_DIR)
fi
# Check for libmm-glib for ModemManager1 support
PKG_CHECK_MODULES(MM_GLIB, mm-glib,
[have_libmm_glib=yes], have_libmm_glib=no)
if test "x$have_libmm_glib" = xno ; then
AC_MSG_WARN(*** Network panel will not be built with ModemManager1 support (libmm-glib not found) ***)
else
AC_DEFINE(HAVE_MM_GLIB, 1, [Defined if libmm-glib is available])
fi
AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
# Check for gnome-bluetooth
PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
[have_bluetooth=yes], have_bluetooth=no)
@ -535,6 +543,11 @@ if test "x$have_networkmanager" = "xyes"; then
else
AC_MSG_NOTICE([ Network panel disabled])
fi
if test "x$have_libmm_glib" = "xyes"; then
AC_MSG_NOTICE([** ModemManager1 support (Network panel)])
else
AC_MSG_NOTICE([ ModemManager1 support disabled])
fi
if test "x$have_bluetooth" = "xyes"; then
AC_MSG_NOTICE([** gnome-bluetooth (Bluetooth panel)])
else