reimplemented dbus plugin for NetworkManager 0.7, renamed to nm

configure.in

@@ -563,6 +563,14 @@ AC_ARG_ENABLE(
 	fi]
 )
 
+AC_ARG_ENABLE(
+	[nm],
+	AS_HELP_STRING([--enable-nm],[enable NetworkManager plugin (default is NO).]),
+	[if test x$enableval = xyes; then
+		nm=true
+	fi]
+)
+
 dnl =========================
 dnl  check required programs
 dnl =========================
@@ -705,6 +713,12 @@ if test x$uci = xtrue; then
 	AC_CHECK_HEADER([uci.h],,[AC_MSG_ERROR([UCI header uci.h not found!])])
 fi
 
+if test x$nm = xtrue; then
+	PKG_CHECK_MODULES(nm, [NetworkManager libnm_glib_vpn gthread-2.0])
+	AC_SUBST(nm_CFLAGS)
+	AC_SUBST(nm_LIBS)
+fi
+
 dnl ======================================
 dnl  collect all plugins for libstrongswan
 dnl ======================================
@@ -798,6 +812,7 @@ dnl ==============
 AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue)
 AM_CONDITIONAL(USE_MEDSRV, test x$medsrv = xtrue)
 AM_CONDITIONAL(USE_MEDCLI, test x$medcli = xtrue)
+AM_CONDITIONAL(USE_NM, test x$nm = xtrue)
 AM_CONDITIONAL(USE_UCI, test x$uci = xtrue)
 AM_CONDITIONAL(USE_SMP, test x$smp = xtrue)
 AM_CONDITIONAL(USE_SQL, test x$sql = xtrue)
@@ -876,6 +891,7 @@ AC_OUTPUT(
 	src/charon/plugins/sql/Makefile
 	src/charon/plugins/medsrv/Makefile
 	src/charon/plugins/medcli/Makefile
+	src/charon/plugins/nm/Makefile
 	src/charon/plugins/uci/Makefile
 	src/charon/plugins/stroke/Makefile
 	src/charon/plugins/unit_tester/Makefile