diff options
| author | Shreyas Srinivasan <sshreyas@novell.com> | 2005-12-22 10:12:34 +0800 |
|---|---|---|
| committer | Shreyas Srinivasan <shres@src.gnome.org> | 2005-12-22 10:12:34 +0800 |
| commit | 87a09855fa42b43e11769b39c89336660f3467e7 (patch) | |
| tree | 8e2880c7b49f68d3e2c4b54101e5731f1a64bab6 /configure.in | |
| parent | 3de1a0bf0ef4a1db6664cb51bfc33eeba0e56c9e (diff) | |
| download | gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.tar gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.tar.gz gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.tar.bz2 gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.tar.lz gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.tar.xz gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.tar.zst gsoc2013-evolution-87a09855fa42b43e11769b39c89336660f3467e7.zip | |
Evolution is now Network Aware, the day of complete awareness beckons, The
2005-12-22 Shreyas Srinivasan <sshreyas@novell.com>
* Evolution is now Network Aware, the day of complete
awareness beckons, The machines are taking over...
* Network Manager support for evolution
svn path=/trunk/; revision=30926
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 56aa2e6bc7..317b5e1700 100644 --- a/configure.in +++ b/configure.in @@ -1143,7 +1143,7 @@ else HAL_REQUIREMENT="" IPOD_SYNC="" fi - + dnl --- Flags for the various libraries we build EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE) @@ -1195,7 +1195,28 @@ AC_SUBST(LIBFILTER_LIBS) dnl --- evolution (shell) flags -EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED) +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}" != "x"; then +dnl if test "x$NM_SUPPORT" = "xyes"; then + AC_DEFINE(NM_SUPPORT, 1, [network manager available]) + NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1" + fi +fi + +AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$NM_SUPPORT_GLIB = xyes) +AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes) + + +EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED $NM_SUPPORT_PACKAGES) + AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) |