epiphany r8873 - in trunk: . src

[otte svn gnome org]

Author: otte
Date: Thu Mar 12 14:47:55 2009
New Revision: 8873
URL: http://svn.gnome.org/viewvc/epiphany?rev=8873&view=rev

Log:
detect NetworkManager using pkg-config


Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/ephy-net-monitor.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Mar 12 14:47:55 2009
@@ -419,8 +419,7 @@
 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])

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Mar 12 14:47:55 2009
@@ -122,6 +122,8 @@
 libephymain_la_SOURCES += \
 	ephy-net-monitor.c	\
 	ephy-net-monitor.h
+
+libephymain_la_CFLAGS += $(NETWORK_MANAGER_CFLAGS)
 endif
 
 if ENABLE_SEED

Modified: trunk/src/ephy-net-monitor.c
==============================================================================
--- trunk/src/ephy-net-monitor.c	(original)
+++ trunk/src/ephy-net-monitor.c	Thu Mar 12 14:47:55 2009
@@ -26,7 +26,7 @@
 #include "ephy-debug.h"
 #include "ephy-prefs.h"
 
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
 
 #include <gmodule.h>