diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-26 05:52:27 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-26 05:52:27 +0800 |
| commit | dd06e70a33a386b716fedd68393885f45a343b68 (patch) | |
| tree | 97e77dd243f3d714f0571a62b4db7c53cb17d2aa /configure.ac | |
| parent | 48828a1977fc21c6fc6d03fa6003a081bf14b017 (diff) | |
| download | gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.tar gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.tar.gz gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.tar.bz2 gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.tar.lz gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.tar.xz gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.tar.zst gsoc2013-epiphany-dd06e70a33a386b716fedd68393885f45a343b68.zip | |
libnm-glib be-gone! Use NetworkManager directly via DBUS, by importing the
2006-01-25 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* data/epiphany.schemas.in:
* embed/mozilla/Makefile.am:
* embed/mozilla/mozilla-embed-single.cpp:
* lib/ephy-prefs.h:
* src/Makefile.am:
* src/ephy-net-monitor.c:
* src/ephy-net-monitor.h:
* src/ephy-shell.c: (ephy_shell_sync_network_status),
(impl_get_embed_single), (ephy_shell_dispose),
(ephy_shell_get_net_monitor), (_ephy_shell_create_instance),
(_ephy_shell_startup):
* src/ephy-shell.h:
libnm-glib be-gone! Use NetworkManager directly via DBUS, by
importing the excellent net-monitor extension directly into
Epiphany. Code by Jean-François Rameau.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c923616c9..1e1ce8494 100644 --- a/configure.ac +++ b/configure.ac @@ -561,17 +561,19 @@ AM_CONDITIONAL([ENABLE_CERTIFICATE_MANAGER],[test "$enable_certificate_manager" AC_MSG_CHECKING([whether to enable NetworkManager support]) AC_ARG_ENABLE([network-manager], - AS_HELP_STRING([--enable-network-manager],[Whether to enable automatic network status with NetworkManager (default: disabled]), + AS_HELP_STRING([--enable-network-manager],[Whether to enable automatic network status with NetworkManager (default: disabled)]), [],[enable_network_manager=no]) AC_MSG_RESULT([$enable_network_manager]) -if test "x$enable_network_manager" != "xno"; then - NETWORKMANAGER_REQUIRED=0.5.0 +if test "$enable_network_manager" != "no"; then + AC_CHECK_HEADERS([NetworkManager/NetworkManager.h], + [have_network_manager=yes],[have_network_manager=no]) - PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm_glib >= $NETWORKMANAGER_REQUIRED], - [enable_network_manager=yes],[enable_network_manager=no]) - AC_SUBST([NETWORK_MANAGER_CFLAGS]) - AC_SUBST([NETWORK_MANAGER_LIBS]) + if test "$enable_network_manager" = "yes" -a "$have_network_manager" = "no"; then + AC_MSG_ERROR([NetworkManager support requested but NetworkManager headers not found]) + elif test "$have_network_manager" = "no"; then + AC_MSG_WARN([NetworkManager headers not found; disabling NetworkManager support]) + fi fi if test "x$enable_network_manager" = "xyes"; then |