Attachment #348606 for bug #470248




                               libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
                               gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
			       libcanberra
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
##########################
# Check for NetworkManager
##########################
NM_MIN_VERSION=0.9
AC_ARG_ENABLE(networkmanager,
              AS_HELP_STRING([--disable-networkmanager],
                             [disable NetworkManager support @<:@default=auto@:>@]),,
              [enable_networkmanager=auto])

if test "x$enable_networkmanager" != "xno"; then
   PKG_CHECK_MODULES(NETWORKMANAGER,
                     [libnm-glib libnm-util gnome-keyring-1],
                     [have_networkmanager=yes],
                     [have_networkmanager=no])

   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
else
   have_networkmanager="no  (disabled)"
fi

if test "x$have_networkmanager" = "xyes"; then
   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
   AC_SUBST([HAVE_NETWORKMANAGER], [1])
else
   if test "x$enable_networkmanager" = "xyes"; then
      AC_MSG_ERROR([Couldn't find NetworkManager.])
   fi
   AC_SUBST([HAVE_NETWORKMANAGER], [0])
fi

AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")

PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)


  files/Makefile
])
AC_OUTPUT

echo "
Build configuration:

	Prefix:                                 ${prefix}
	Source code location:                   ${srcdir}
	Compiler:                               ${CC}
	Compiler Warnings:                      $enable_compile_warnings

	Support for NetworkManager:             $have_networkmanager
	Support for GStreamer recording:        $build_recorder
"

Lines 8-12 Link Here

(-)linuxmint-Cinnamon-ded6f27/js/misc/config.js.in (+2 lines)
8	const GJS_VERSION = '@GJS_VERSION@';	8	const GJS_VERSION = '@GJS_VERSION@';
9	/* 1 if gnome-bluetooth is available, 0 otherwise */	9	/* 1 if gnome-bluetooth is available, 0 otherwise */
10	const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;	10	const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
		11	/* 1 if networkmanager is available, 0 otherwise */
		12	const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
11	/* The system TLS CA list */	13	/* The system TLS CA list */
12	const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';	14	const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';

Lines 110-118 Link Here

(-)linuxmint-Cinnamon-ded6f27/src/Makefile.am (-5 / +12 lines)
110	cinnamon-generic-container.h \	110	cinnamon-generic-container.h \
111	cinnamon-gtk-embed.h \	111	cinnamon-gtk-embed.h \
112	cinnamon-global.h \	112	cinnamon-global.h \
113	cinnamon-mobile-providers.h \
114	cinnamon-mount-operation.h \	113	cinnamon-mount-operation.h \
115	cinnamon-network-agent.h \
116	cinnamon-perf-log.h \	114	cinnamon-perf-log.h \
117	cinnamon-screenshot.h \	115	cinnamon-screenshot.h \
118	cinnamon-screen-grabber.h \	116	cinnamon-screen-grabber.h \
Lines 125-130 Link Here
125	cinnamon-wm.h \	123	cinnamon-wm.h \
126	cinnamon-xfixes-cursor.h	124	cinnamon-xfixes-cursor.h
127		125
		126	if HAVE_NETWORKMANAGER
		127	cinnamon_public_headers_h += cinnamon-mobile-providers.h cinnamon-network-agent.h
		128	endif
		129
128	libcinnamon_la_SOURCES = \	130	libcinnamon_la_SOURCES = \
129	$(cinnamon_built_sources) \	131	$(cinnamon_built_sources) \
130	$(cinnamon_public_headers_h) \	132	$(cinnamon_public_headers_h) \
Lines 147-155 Link Here
147	cinnamon-generic-container.c \	149	cinnamon-generic-container.c \
148	cinnamon-gtk-embed.c \	150	cinnamon-gtk-embed.c \
149	cinnamon-global.c \	151	cinnamon-global.c \
150	cinnamon-mobile-providers.c \
151	cinnamon-mount-operation.c \	152	cinnamon-mount-operation.c \
152	cinnamon-network-agent.c \
153	cinnamon-perf-log.c \	153	cinnamon-perf-log.c \
154	cinnamon-polkit-authentication-agent.h \	154	cinnamon-polkit-authentication-agent.h \
155	cinnamon-polkit-authentication-agent.c \	155	cinnamon-polkit-authentication-agent.c \
Lines 164-169 Link Here
164	cinnamon-wm.c \	164	cinnamon-wm.c \
165	cinnamon-xfixes-cursor.c	165	cinnamon-xfixes-cursor.c
166		166
		167	if HAVE_NETWORKMANAGER
		168	libcinnamon_la_SOURCES += cinnamon-mobile-providers.c cinnamon-network-agent.c
		169	endif
		170
167	libcinnamon_la_gir_sources = \	171	libcinnamon_la_gir_sources = \
168	$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES))	172	$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES))
169		173
Lines 275-281 Link Here
275	libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)	279	libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
276		280
277	Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir	281	Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
278	Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0	282	Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 GMenu-3.0
		283	if HAVE_NETWORKMANAGER
		284	Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
		285	endif
279	Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)	286	Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
280	Cinnamon_0_1_gir_LIBS = libcinnamon.la	287	Cinnamon_0_1_gir_LIBS = libcinnamon.la
281	Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)	288	Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)

Return to bug 470248

Lines 81-88 Link Here

(-)linuxmint-Cinnamon-ded6f27/configure.ac (-2 / +45 lines)
81	libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION	81	libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
82	gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION	82	gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
83	libcanberra	83	libcanberra
84	polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes	84	polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
85	libnm-glib libnm-util gnome-keyring-1)	85	##########################
		86	# Check for NetworkManager
		87	##########################
		88	NM_MIN_VERSION=0.9
		89	AC_ARG_ENABLE(networkmanager,
		90	AS_HELP_STRING([--disable-networkmanager],
		91	[disable NetworkManager support @<:@default=auto@:>@]),,
		92	[enable_networkmanager=auto])
		93
		94	if test "x$enable_networkmanager" != "xno"; then
		95	PKG_CHECK_MODULES(NETWORKMANAGER,
		96	[libnm-glib libnm-util gnome-keyring-1],
		97	[have_networkmanager=yes],
		98	[have_networkmanager=no])
		99
		100	CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
		101	CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
		102	else
		103	have_networkmanager="no (disabled)"
		104	fi
		105
		106	if test "x$have_networkmanager" = "xyes"; then
		107	AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
		108	AC_SUBST([HAVE_NETWORKMANAGER], [1])
		109	else
		110	if test "x$enable_networkmanager" = "xyes"; then
		111	AC_MSG_ERROR([Couldn't find NetworkManager.])
		112	fi
		113	AC_SUBST([HAVE_NETWORKMANAGER], [0])
		114	fi
		115
		116	AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
86		117
87	PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)	118	PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
88		119
Lines 239-241 Link Here
239	files/Makefile	270	files/Makefile
240	])	271	])
241	AC_OUTPUT	272	AC_OUTPUT
		273
		274	echo "
		275	Build configuration:
		276
		277	Prefix: ${prefix}
		278	Source code location: ${srcdir}
		279	Compiler: ${CC}
		280	Compiler Warnings: $enable_compile_warnings
		281
		282	Support for NetworkManager: $have_networkmanager
		283	Support for GStreamer recording: $build_recorder
		284	"

Lines 57-62 Link Here

(-)linuxmint-Cinnamon-ded6f27/js/ui/main.js (-1 / +2 lines)
57	const AppletManager = imports.ui.appletManager;	57	const AppletManager = imports.ui.appletManager;
58	const AutomountManager = imports.ui.automountManager;	58	const AutomountManager = imports.ui.automountManager;
59	const AutorunManager = imports.ui.autorunManager;	59	const AutorunManager = imports.ui.autorunManager;
		60	const Config = imports.misc.config;
60	const DeskletManager = imports.ui.deskletManager;	61	const DeskletManager = imports.ui.deskletManager;
61	const EndSessionDialog = imports.ui.endSessionDialog;	62	const EndSessionDialog = imports.ui.endSessionDialog;
62	const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;	63	const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
Lines 70-76 Link Here
70	const RunDialog = imports.ui.runDialog;	71	const RunDialog = imports.ui.runDialog;
71	const Layout = imports.ui.layout;	72	const Layout = imports.ui.layout;
72	const LookingGlass = imports.ui.lookingGlass;	73	const LookingGlass = imports.ui.lookingGlass;
73	const NetworkAgent = imports.ui.networkAgent;	74	const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
74	const NotificationDaemon = imports.ui.notificationDaemon;	75	const NotificationDaemon = imports.ui.notificationDaemon;
75	const WindowAttentionHandler = imports.ui.windowAttentionHandler;	76	const WindowAttentionHandler = imports.ui.windowAttentionHandler;
76	const Scripting = imports.ui.scripting;	77	const Scripting = imports.ui.scripting;