[network-manager-pptp/NM_0_8] build: bump NM lib requirements

[Dan Williams <dcbw src gnome org>]

commit e7ef600e9773a2e8e69b003bd6e392723fe5c601
Author: Dan Williams <dcbw redhat com>
Date:   Mon Oct 25 08:48:54 2010 -0500

    build: bump NM lib requirements

 auth-dialog/Makefile.am  |    2 +-
 common-gnome/Makefile.am |    4 ++--
 configure.ac             |   10 +++++++---
 properties/Makefile.am   |    4 ++--
 src/Makefile.am          |   14 +++++++-------
 5 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 7890662..446955b 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 libexec_PROGRAMS = nm-pptp-auth-dialog
 
 nm_pptp_auth_dialog_CPPFLAGS =			\
-	$(NM_UTILS_CFLAGS)			\
+	$(NETWORKMANAGER_CFLAGS)		\
 	$(GTHREAD_CFLAGS)			\
 	$(GTK_CFLAGS)				\
 	$(GCONF_CFLAGS)				\
diff --git a/common-gnome/Makefile.am b/common-gnome/Makefile.am
index bae9975..04fa6bc 100644
--- a/common-gnome/Makefile.am
+++ b/common-gnome/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES=libnm-pptp-common-gnome.la
 
 libnm_pptp_common_gnome_la_CPPFLAGS = \
-	$(NM_UTILS_CFLAGS) \
+	$(NETWORKMANAGER_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
 	-DG_DISABLE_DEPRECATED
@@ -11,7 +11,7 @@ libnm_pptp_common_gnome_la_SOURCES= \
 	keyring-helpers.h
 
 libnm_pptp_common_gnome_la_LIBADD = \
-	$(NM_UTILS_LIBS) \
+	$(NETWORKMANAGER_LIBS) \
 	$(GLIB_LIBS) \
 	$(GNOMEKEYRING_LIBS)
 
diff --git a/configure.ac b/configure.ac
index e06462c..288385e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,9 +69,13 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
 AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
 
-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)
 
 if test x"$with_gnome" != xno; then
 	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.14)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index ec20add..50b49fc 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_pptp_properties_la_CFLAGS =                    \
         $(GCONF_CFLAGS)                                 \
         $(LIBGNOMEUI_CFLAGS)                            \
         $(GNOMEKEYRING_CFLAGS)                          \
-        $(NM_UTILS_CFLAGS)                              \
+        $(NETWORKMANAGER_CFLAGS)                        \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
@@ -33,7 +33,7 @@ libnm_pptp_properties_la_LIBADD =    \
         $(GCONF_LIBS)                   \
         $(LIBGNOMEUI_LIBS)              \
         $(top_builddir)/common-gnome/libnm-pptp-common-gnome.la	\
-        $(NM_UTILS_LIBS)
+        $(NETWORKMANAGER_LIBS)
 
 libnm_pptp_properties_la_LDFLAGS =   \
         -avoid-version
diff --git a/src/Makefile.am b/src/Makefile.am
index 685fac8..9f43026 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 AM_CPPFLAGS =							\
 	$(DBUS_GLIB_CFLAGS)						\
 	$(GTHREAD_CFLAGS)					\
-	$(NM_UTILS_CFLAGS)				\
+	$(NETWORKMANAGER_CFLAGS)				\
 	-DG_DISABLE_DEPRECATED					\
 	-DBINDIR=\"$(bindir)\"					\
 	-DPREFIX=\""$(prefix)"\"				\
@@ -24,10 +24,10 @@ nm_pptp_service_SOURCES = \
 nm-pptp-pppd-service-glue.h: $(top_srcdir)/src/nm-pptp-pppd-service.xml
 	dbus-binding-tool --prefix=nm_pptp_pppd_service --mode=glib-server --output=$@ $<
 
-nm_pptp_service_LDADD = 				\
-				$(DBUS_GLIB_LIBS)		\
-				$(GTHREAD_LIBS)		\
-				$(NM_UTILS_LIBS)
+nm_pptp_service_LDADD = \
+	$(DBUS_GLIB_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(NETWORKMANAGER_LIBS)
 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-pptp-pppd-plugin.la
@@ -39,14 +39,14 @@ nm_pptp_pppd_plugin_la_SOURCES = \
 nm_pptp_pppd_plugin_la_CPPFLAGS = \
 	$(DBUS_GLIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(NM_UTILS_CFLAGS)
+	$(NETWORKMANAGER_CFLAGS)
 
 nm_pptp_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pptp_pppd_plugin_la_LIBADD = \
 	$(DBUS_GLIB_LIBS) \
 	$(GLIB_LIBS) \
-	$(NM_UTILS_LIBS)
+	$(NETWORKMANAGER_LIBS)
 
 BUILT_SOURCES = nm-pptp-pppd-service-glue.h