Define ME for all charon plugins

diff --git a/configure.in b/configure.in
index ec2ab1d615a7548fed2115d5a00fee661d886a96..2b0f9a81b7e23c04634a01f0ce0cff70e0bffcd3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -216,12 +216,12 @@ if test x$manager = xtrue; then
 fi
 
 if test x$medsrv = xtrue; then
-       me=true
+       mediation=true
        fast=true
 fi
 
 if test x$medcli = xtrue; then
-       me=true
+       mediation=true
 fi
 
 dnl ===========================================
@@ -727,7 +727,7 @@ dnl ==============================
 dnl  set global definitions
 dnl ==============================
 
-if test x$me = xtrue; then
+if test x$mediation = xtrue; then
        AC_DEFINE(ME)
 fi
 if test x$capabilities = xlibcap; then

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index e87524989040c5db0959247d7dca0710db2cf12f..4942b47d9bffab5aea19cbbc8f51165e59173d0b 100644 (file)
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -125,7 +125,6 @@ if USE_ME
     sa/connect_manager.c sa/connect_manager.h \
     sa/mediation_manager.c sa/mediation_manager.h \
     sa/tasks/ike_me.c sa/tasks/ike_me.h
-  AM_CFLAGS += -DME
 endif
 
 if USE_CAPABILITIES