[network-manager-openconnect/NM_0_8: 7/55] build: fix up NM dependencies

[David Woodhouse <dwmw2 src gnome org>]

commit 415a493fe929a4bab69863bf2ac25536d6cb6a3d
Author: Dan Williams <dcbw redhat com>
Date:   Mon Oct 25 08:57:56 2010 -0500

    build: fix up NM dependencies

 configure.ac           |   10 +++++++---
 properties/Makefile.am |    4 ++--
 src/Makefile.am        |   24 +++++++++++++-----------
 3 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2906374..697d335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,9 +79,13 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GNOMEKEYRING_LIBS)
 fi
 
-PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.8.1 libnm-util libnm-glib libnm-glib-vpn)
-AC_SUBST(NM_UTILS_CFLAGS)
-AC_SUBST(NM_UTILS_LIBS)
+PKG_CHECK_MODULES(NETWORKMANAGER,
+                  NetworkManager >= 0.8.1.997
+                  libnm-util >= 0.8.1.997
+                  libnm-glib  >= 0.8.1.997
+                  libnm-glib-vpn >= 0.8.1.997)
+AC_SUBST(NETWORKMANAGER_CFLAGS)
+AC_SUBST(NETWORKMANAGER_LIBS)
 
 NM_COMPILER_WARNINGS
 
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 0b5921e..6646ad5 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -15,7 +15,7 @@ libnm_openconnect_properties_la_CFLAGS =                          \
         $(GTK_CFLAGS)                                   \
         $(GCONF_CFLAGS)                                 \
         $(LIBGNOMEUI_CFLAGS)                            \
-        $(NM_UTILS_CFLAGS)                              \
+        $(NETWORKMANAGER_CFLAGS)                        \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
@@ -29,7 +29,7 @@ libnm_openconnect_properties_la_LIBADD = \
         $(GTK_LIBS) \
         $(GCONF_LIBS) \
         $(LIBGNOMEUI_LIBS) \
-        $(NM_UTILS_LIBS)
+        $(NETWORKMANAGER_LIBS)
 
 libnm_openconnect_properties_la_LDFLAGS =      \
         -avoid-version
diff --git a/src/Makefile.am b/src/Makefile.am
index af25550..127761d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
 	-DPREFIX=\""$(prefix)"\" \
@@ -14,25 +14,27 @@ AM_CPPFLAGS = \
 	-DLOCALSTATEDIR=\""$(localstatedir)"\" \
 	-DDATADIR=\"$(datadir)\"
 
-libexec_PROGRAMS = nm-openconnect-service nm-openconnect-service-openconnect-helper
+libexec_PROGRAMS = \
+	nm-openconnect-service \
+	nm-openconnect-service-openconnect-helper
 
 nm_openconnect_service_SOURCES = \
-				nm-openconnect-service.c \
-				nm-openconnect-service.h
+	nm-openconnect-service.c \
+	nm-openconnect-service.h
 
 
 nm_openconnect_service_LDADD = \
-				$(DBUS_LIBS) \
-				$(GTHREAD_LIBS) \
-				$(NM_UTILS_LIBS)
+	$(DBUS_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(NETWORKMANAGER_LIBS)
 
 
 nm_openconnect_service_openconnect_helper_SOURCES = \
-				nm-openconnect-service-openconnect-helper.c
+	nm-openconnect-service-openconnect-helper.c
 
 nm_openconnect_service_openconnect_helper_LDADD = \
-				$(DBUS_LIBS) \
-				$(GTHREAD_LIBS) \
-				$(NM_UTILS_LIBS)
+	$(DBUS_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(NETWORKMANAGER_LIBS)
 
 CLEANFILES = *~