summaryrefslogtreecommitdiff
path: root/conf/Makefile.am
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2015-06-01 15:00:29 +0200
committerYves-Alexis Perez <corsac@debian.org>2015-06-01 15:00:29 +0200
commit67b61882ae49026bd719fffe5455c7655d38c81a (patch)
treeeffdddbd0961208a357c3025f5eeba10a95a7bdb /conf/Makefile.am
parent67003dcc0cb5b0ba7e06104b99cb5acced9f6fca (diff)
parentfc556ec2bc92a9d476c11406fad2c33db8bf7cb0 (diff)
downloadvyos-strongswan-67b61882ae49026bd719fffe5455c7655d38c81a.tar.gz
vyos-strongswan-67b61882ae49026bd719fffe5455c7655d38c81a.zip
Merge tag 'upstream/5.3.1'
Upstream version 5.3.1 Conflicts: src/libstrongswan/plugins/aesni/aesni_cbc.h
Diffstat (limited to 'conf/Makefile.am')
-rw-r--r--conf/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am
index f10af25a2..7cee0cbd6 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -14,6 +14,7 @@ options = \
options/charon-logging.opt \
options/charon-systemd.opt \
options/imcv.opt \
+ options/imv_policy_manager.opt \
options/manager.opt \
options/medsrv.opt \
options/pacman.opt \