From 51cf7473e5f18cc62d0aec64d468d20b68b92452 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@src.gnome.org>
Date: Thu, 12 Mar 2009 14:47:55 +0000
Subject: detect NetworkManager using pkg-config

svn path=/trunk/; revision=8873
---
 configure.ac           | 3 +--
 src/Makefile.am        | 2 ++
 src/ephy-net-monitor.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index fd9f0b471..3d825d5ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -419,8 +419,7 @@ AC_ARG_ENABLE([network-manager],
 AC_MSG_RESULT([$enable_network_manager])
 
 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, NetworkManager, [have_network_manager=yes],[have_network_manager=no])
 
 	if test "$enable_network_manager" = "yes" -a "$have_network_manager" = "no"; then
 		AC_MSG_ERROR([NetworkManager support requested but NetworkManager headers not found])
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d8fd6f09..a94d08285 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,6 +122,8 @@ if ENABLE_NETWORK_MANAGER
 libephymain_la_SOURCES += \
 	ephy-net-monitor.c	\
 	ephy-net-monitor.h
+
+libephymain_la_CFLAGS += $(NETWORK_MANAGER_CFLAGS)
 endif
 
 if ENABLE_SEED
diff --git a/src/ephy-net-monitor.c b/src/ephy-net-monitor.c
index 762a9fb8f..69f8be7b7 100644
--- a/src/ephy-net-monitor.c
+++ b/src/ephy-net-monitor.c
@@ -26,7 +26,7 @@
 #include "ephy-debug.h"
 #include "ephy-prefs.h"
 
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
 
 #include <gmodule.h>
 
-- 
cgit v1.2.3