From 568ced956c8fc955492a3ef2303d4324822e96f0 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Mon, 27 Apr 2009 10:46:51 +0000
Subject: [PATCH] prefer nm plugin over resolv-conf

---
 src/charon/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index ef62bff15..964402869 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -198,11 +198,6 @@ if USE_ATTR
   PLUGINS += attr
 endif
 
-if USE_RESOLV_CONF
-  SUBDIRS += plugins/resolv_conf
-  PLUGINS += resolv-conf
-endif
-
 if USE_EAP_IDENTITY
   SUBDIRS += plugins/eap_identity
   PLUGINS += eapidentity
@@ -258,6 +253,11 @@ if USE_NM
   PLUGINS += nm
 endif
 
+if USE_RESOLV_CONF
+  SUBDIRS += plugins/resolv_conf
+  PLUGINS += resolv-conf
+endif
+
 if USE_UCI
   SUBDIRS += plugins/uci
   PLUGINS += uci