[network-manager-openswan] build: minor fixes and cleanups

[Dan Williams <dcbw src gnome org>]

commit 6eb56b6a4579dcd8d36d7d9fa3dcccbb62466a5d
Author: Dan Williams <dcbw redhat com>
Date:   Wed Aug 17 16:31:43 2011 -0500

    build: minor fixes and cleanups

 configure.ac |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2cf03af..c225ddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,14 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+PKG_CHECK_MODULES(NM,
+	NetworkManager >= 0.8.998
+	libnm-util >= 0.8.998
+	libnm-glib >= 0.8.998
+	libnm-glib-vpn >= 0.8.998)
+AC_SUBST(NM_CFLAGS)
+AC_SUBST(NM_LIBS)
+
 if test x"$with_gnome" != xno; then
 	AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
 	            with_gtkver="$withval",with_gtkver=0)
@@ -86,6 +94,8 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GTK_LIBS)
 
 	PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
+	AC_SUBST(GNOMEKEYRING_CFLAGS)
+	AC_SUBST(GNOMEKEYRING_LIBS)
 fi
 
 dnl
@@ -96,10 +106,6 @@ if ! test x"$ac_distver" = x""; then
   AC_DEFINE_UNQUOTED(DIST_VERSION, "$ac_distver", [Define the distribution version string])
 fi
 
-PKG_CHECK_MODULES(NM, NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
-
 NM_COMPILER_WARNINGS
 
 AC_CONFIG_FILES([