diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-23 23:36:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-23 23:36:32 +0800 |
| commit | fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e (patch) | |
| tree | e97b9ea12c3007cee5933246893d18a63461ce3a /configure.in | |
| parent | 036bb44de80f86a9fa5d92ce9e8848332f2a9cd2 (diff) | |
| download | gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.gz gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.bz2 gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.lz gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.xz gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.tar.zst gsoc2013-evolution-fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e.zip | |
Progress update:
- Discard libnm-glib method of monitoring network connectivity.
- Decided to make EShell a singleton GObject after all. Makes the
design cleaner, despite having to pass a singleton instance around.
- Make the switcher button style persistent.
svn path=/branches/kill-bonobo/; revision=36043
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/configure.in b/configure.in index c974e89f7e..1330edf1d4 100644 --- a/configure.in +++ b/configure.in @@ -1517,22 +1517,15 @@ dnl --- evolution (shell) flags NM_SUPPORT_PACKAGES="" -PKG_CHECK_MODULES(NM, dbus-glib-1 libnm_glib, NM_SUPPORT_GLIB="yes", NM_SUPPORT_GLIB="no") -if test "x$NM_SUPPORT_GLIB" = "xyes"; then - AC_DEFINE(NM_SUPPORT_GLIB, 1, [network manager available]) - NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1 libnm_glib" -else - PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no") - AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] ) - if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then +PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no") +AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [nm_header="yes"]) +if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then AC_DEFINE(NM_SUPPORT, 1, [network manager available]) NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1" - else +else NM_SUPPORT=no - fi -fi +fi -AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$NM_SUPPORT_GLIB = xyes) AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes) |