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

(-)a/configure.ac (-8 / +42 lines)
Lines 180-191 AM_CONDITIONAL(HAVE_INTROSPECTION, false) Link Here
180
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
180
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
181
AC_SUBST(GDESKTOP_PREFIX)
181
AC_SUBST(GDESKTOP_PREFIX)
182
182
183
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
183
# Check for NetworkManager support
184
                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
184
AC_ARG_ENABLE(networkmanager,
185
                  libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
185
	AC_HELP_STRING([--disable-networkmanager],
186
                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
186
		[disable networkmanager support (enabled by default)]),
187
                  libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION,
187
	[case "${enableval}" in
188
                  [have_networkmanager=yes], have_networkmanager=no)
188
		yes) WANT_NETWORKMANAGER=yes ;;
189
		no)  WANT_NETWORKMANAGER=no ;;
190
		*) AC_MSG_ERROR(bad value ${enableval} for --disable-networkmanager) ;;
191
	esac],
192
	[WANT_NETWORKMANAGER=yes]) dnl Default value
193
194
if test "x$WANT_NETWORKMANAGER" = xyes ; then
195
   	PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
196
                          libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
197
                          libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
198
                          libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
199
                          libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION,
200
                          [have_networkmanager=yes],
201
			  AC_MSG_ERROR(Network Manager not found))
202
else
203
	have_networkmanager=no
204
fi
205
206
189
if test "x$have_networkmanager" = xno ; then
207
if test "x$have_networkmanager" = xno ; then
190
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager not found) ***)
208
        AC_MSG_WARN(*** Network panel will not be built (NetworkManager not found) ***)
191
else
209
else
Lines 201-208 if test x${have_networkmanager} = xyes; then Link Here
201
fi
219
fi
202
220
203
# Check for libmm-glib for ModemManager1 support
221
# Check for libmm-glib for ModemManager1 support
204
PKG_CHECK_MODULES(MM_GLIB, mm-glib,
222
AC_ARG_ENABLE(modemmanager,
205
                  [have_libmm_glib=yes], have_libmm_glib=no)
223
	AC_HELP_STRING([--disable-modemmanager],
224
		[disable modemmanager support]),
225
	[case "${enableval}" in
226
		yes) WANT_MODEMMANAGER=yes ;;
227
		no)  WANT_MODEMMANAGER=no ;;
228
		*) AC_MSG_ERROR(bad value ${enableval} for --disable-modemmanager) ;;
229
	esac],
230
	[WANT_MODEMMANAGER=no]) dnl Default value
231
232
if test "x$WANT_MODEMMANAGER" = xyes && test "x$have_networkmanager" = yes ; then
233
	PKG_CHECK_MODULES(MM_GLIB, mm-glib,
234
                  [have_libmm_glib=yes],
235
		  AC_MSG_ERROR(No ModemManager1 support (libmm-glib) not found))
236
else
237
	have_libmm_glib=no
238
fi
239
206
if test "x$have_libmm_glib" = xno ; then
240
if test "x$have_libmm_glib" = xno ; then
207
  AC_MSG_WARN(*** Network panel will not be built with ModemManager1 support (libmm-glib not found) ***)
241
  AC_MSG_WARN(*** Network panel will not be built with ModemManager1 support (libmm-glib not found) ***)
208
else
242
else

Return to bug 478204