From e20b7921081e380b2bb1c94e83aa043600d7bc88 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 23 Sep 2009 10:49:38 +0200 Subject: [PATCH] Correctly handle --enable-mediation option --- configure.in | 2 +- src/charon/Makefile.am | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 101149316..ec2ab1d61 100644 --- a/configure.in +++ b/configure.in @@ -711,7 +711,7 @@ AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue) AM_CONDITIONAL(USE_DUMM, test x$dumm = xtrue) AM_CONDITIONAL(USE_FAST, test x$fast = xtrue) AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue) -AM_CONDITIONAL(USE_ME, test x$me = xtrue) +AM_CONDITIONAL(USE_ME, test x$mediation = xtrue) AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue) AM_CONDITIONAL(USE_CAPABILITIES, test x$capabilities = xlibcap) AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue) diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am index 4942b47d9..e87524989 100644 --- a/src/charon/Makefile.am +++ b/src/charon/Makefile.am @@ -125,6 +125,7 @@ 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