← Back to branch summary

~khurshid-alam/unity-control-center/use-usd-schemas

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Sebastien Bacher
  • Author(s): Khurshid Alam
  • Date: 2019-05-17 07:34:33 UTC
  • mfrom: (12920.1.1 unity-control-center)
  • Revision ID: seb128@ubuntu.com-20190517073433-ch2kybdhhzpkmvq4
Network: Port to libnm 1.2 (lp: #1744619)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
113
113
CANBERRA_REQUIRED_VERSION=0.13
114
114
GDKPIXBUF_REQUIRED_VERSION=2.23.0
115
115
POLKIT_REQUIRED_VERSION=0.103
116
 
NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
 
116
NETWORK_MANAGER_REQUIRED_VERSION=1.2.0
 
117
NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0
 
118
MODEM_MANAGER_REQUIRED_VERSION=0.7
117
119
LIBNOTIFY_REQUIRED_VERSION=0.7.3
118
120
GNOME_DESKTOP_REQUIRED_VERSION=3.27.3
119
121
SCHEMAS_REQUIRED_VERSION=3.15.4
149
151
PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
150
152
PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
151
153
                  unity-settings-daemon x11)
152
 
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
 
154
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
 
155
                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
153
156
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
154
157
                  unity-settings-daemon)
155
158
PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
182
185
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
183
186
AC_SUBST(GDESKTOP_PREFIX)
184
187
 
185
 
# Check for NetworkManager ~0.9
186
 
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
187
 
                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
188
 
                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
189
 
                  libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION,
 
188
# Check for NetworkManager ~1.2
 
189
PKG_CHECK_MODULES(NETWORK_MANAGER,
 
190
                  libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
 
191
                  libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
 
192
                          mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
190
193
                  [have_networkmanager=yes], have_networkmanager=no)
191
194
if test "x$have_networkmanager" = xno ; then
192
 
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***)
 
195
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~1.2 or newer not found) ***)
 
196
else
 
197
        AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
193
198
fi
194
199
AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
195
200
 
516
521
panels/printers/Makefile
517
522
panels/printers/unity-printers-panel.desktop.in
518
523
panels/network/Makefile
 
524
panels/network/wireless-security/Makefile
 
525
panels/network/connection-editor/Makefile
519
526
panels/network/unity-network-panel.desktop.in
520
527
panels/universal-access/Makefile
521
528
panels/universal-access/unity-universal-access-panel.desktop.in