42 lines
1.8 KiB
Plaintext
42 lines
1.8 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.8 2012/11/13 18:19:13 jasper Exp $
|
|
|
|
Make Network Manager support optional.
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=679871
|
|
|
|
--- configure.ac.orig Mon Nov 12 22:00:58 2012
|
|
+++ configure.ac Tue Nov 13 18:50:30 2012
|
|
@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI
|
|
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
|
|
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
|
|
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
|
|
- libnm-glib libnm-util gnome-keyring-1
|
|
+ gnome-keyring-1
|
|
gcr-3 >= $GCR_MIN_VERSION
|
|
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
|
|
|
|
@@ -140,6 +140,24 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
|
|
[AC_DEFINE([HAVE_BLUETOOTH],[0])
|
|
AC_SUBST([HAVE_BLUETOOTH],[0])
|
|
AC_MSG_RESULT([no])])
|
|
+
|
|
+network_manager=false
|
|
+AC_MSG_CHECKING([for Network Manager support])
|
|
+PKG_CHECK_EXISTS([libnm-glib libnm-util],
|
|
+ [NM_LIBS=`$PKG_CONFIG --libs libnm-glib libnm-util`
|
|
+ NM_CFLAGS=`$PKG_CONFIG --cflags libnm-glib libnm-util`
|
|
+ AC_SUBST([NM_LIBS],["$NM_LIBS"])
|
|
+ AC_SUBST([NM_CFLAGS],["$NM_CFLAGS"])
|
|
+ AC_DEFINE([HAVE_NETWORK_MANAGER],[1],[Define to 1 if you have Network Manager])
|
|
+ AC_SUBST([HAVE_NETWORK_MANAGER],[1])
|
|
+ AC_MSG_RESULT([yes])
|
|
+ network_manager=true],
|
|
+ [AC_DEFINE([HAVE_NETWORK_MANAGER],[0])
|
|
+ AC_SUBST([HAVE_NETWORK_MANAGER],[0])
|
|
+ AC_MSG_RESULT([no])])
|
|
+
|
|
+AM_CONDITIONAL(NETWORK_MANAGER, $network_manager)
|
|
+GNOME_SHELL=$GNOME_SHELL $NM_LIBS
|
|
|
|
PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
|
|
AC_SUBST(CALENDAR_SERVER_CFLAGS)
|