From 29a46aacade7a516c2fae5e9134a90b106f12c0e Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Fri, 19 Mar 2010 19:03:46 +0100
Subject: [PATCH] Moved ha plugin to libcharon

---
 src/libcharon/Makefile.am                            | 8 ++++++++
 src/{charon => libcharon}/plugins/ha/Makefile.am     | 9 +++++++--
 src/{charon => libcharon}/plugins/ha/ha_child.c      | 0
 src/{charon => libcharon}/plugins/ha/ha_child.h      | 0
 src/{charon => libcharon}/plugins/ha/ha_ctl.c        | 0
 src/{charon => libcharon}/plugins/ha/ha_ctl.h        | 0
 src/{charon => libcharon}/plugins/ha/ha_dispatcher.c | 0
 src/{charon => libcharon}/plugins/ha/ha_dispatcher.h | 0
 src/{charon => libcharon}/plugins/ha/ha_ike.c        | 0
 src/{charon => libcharon}/plugins/ha/ha_ike.h        | 0
 src/{charon => libcharon}/plugins/ha/ha_kernel.c     | 0
 src/{charon => libcharon}/plugins/ha/ha_kernel.h     | 0
 src/{charon => libcharon}/plugins/ha/ha_message.c    | 0
 src/{charon => libcharon}/plugins/ha/ha_message.h    | 0
 src/{charon => libcharon}/plugins/ha/ha_plugin.c     | 0
 src/{charon => libcharon}/plugins/ha/ha_plugin.h     | 0
 src/{charon => libcharon}/plugins/ha/ha_segments.c   | 0
 src/{charon => libcharon}/plugins/ha/ha_segments.h   | 0
 src/{charon => libcharon}/plugins/ha/ha_socket.c     | 0
 src/{charon => libcharon}/plugins/ha/ha_socket.h     | 0
 src/{charon => libcharon}/plugins/ha/ha_tunnel.c     | 0
 src/{charon => libcharon}/plugins/ha/ha_tunnel.h     | 0
 22 files changed, 15 insertions(+), 2 deletions(-)
 rename src/{charon => libcharon}/plugins/ha/Makefile.am (75%)
 rename src/{charon => libcharon}/plugins/ha/ha_child.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_child.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_ctl.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_ctl.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_dispatcher.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_dispatcher.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_ike.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_ike.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_kernel.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_kernel.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_message.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_message.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_plugin.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_plugin.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_segments.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_segments.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_socket.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_socket.h (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_tunnel.c (100%)
 rename src/{charon => libcharon}/plugins/ha/ha_tunnel.h (100%)

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 14d3c39bb..df056ad9f 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -388,6 +388,14 @@ if MONOLITHIC
 endif
 endif
 
+if USE_HA
+  SUBDIRS += plugins/ha
+  PLUGINS += ha
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/ha/libstrongswan-ha.la
+endif
+endif
+
 if USE_UCI
   SUBDIRS += plugins/uci
   PLUGINS += uci
diff --git a/src/charon/plugins/ha/Makefile.am b/src/libcharon/plugins/ha/Makefile.am
similarity index 75%
rename from src/charon/plugins/ha/Makefile.am
rename to src/libcharon/plugins/ha/Makefile.am
index 52dc95de0..9d321dc8f 100644
--- a/src/charon/plugins/ha/Makefile.am
+++ b/src/libcharon/plugins/ha/Makefile.am
@@ -1,9 +1,14 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
 
+if MONOLITHIC
+noinst_LTLIBRARIES = libstrongswan-ha.la
+else
 plugin_LTLIBRARIES = libstrongswan-ha.la
+endif
+
 libstrongswan_ha_la_SOURCES = \
   ha_plugin.h ha_plugin.c \
   ha_message.h ha_message.c \
@@ -15,5 +20,5 @@ libstrongswan_ha_la_SOURCES = \
   ha_ctl.h ha_ctl.c \
   ha_ike.h ha_ike.c \
   ha_child.h ha_child.c
-libstrongswan_ha_la_LDFLAGS = -module
+libstrongswan_ha_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/charon/plugins/ha/ha_child.c b/src/libcharon/plugins/ha/ha_child.c
similarity index 100%
rename from src/charon/plugins/ha/ha_child.c
rename to src/libcharon/plugins/ha/ha_child.c
diff --git a/src/charon/plugins/ha/ha_child.h b/src/libcharon/plugins/ha/ha_child.h
similarity index 100%
rename from src/charon/plugins/ha/ha_child.h
rename to src/libcharon/plugins/ha/ha_child.h
diff --git a/src/charon/plugins/ha/ha_ctl.c b/src/libcharon/plugins/ha/ha_ctl.c
similarity index 100%
rename from src/charon/plugins/ha/ha_ctl.c
rename to src/libcharon/plugins/ha/ha_ctl.c
diff --git a/src/charon/plugins/ha/ha_ctl.h b/src/libcharon/plugins/ha/ha_ctl.h
similarity index 100%
rename from src/charon/plugins/ha/ha_ctl.h
rename to src/libcharon/plugins/ha/ha_ctl.h
diff --git a/src/charon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
similarity index 100%
rename from src/charon/plugins/ha/ha_dispatcher.c
rename to src/libcharon/plugins/ha/ha_dispatcher.c
diff --git a/src/charon/plugins/ha/ha_dispatcher.h b/src/libcharon/plugins/ha/ha_dispatcher.h
similarity index 100%
rename from src/charon/plugins/ha/ha_dispatcher.h
rename to src/libcharon/plugins/ha/ha_dispatcher.h
diff --git a/src/charon/plugins/ha/ha_ike.c b/src/libcharon/plugins/ha/ha_ike.c
similarity index 100%
rename from src/charon/plugins/ha/ha_ike.c
rename to src/libcharon/plugins/ha/ha_ike.c
diff --git a/src/charon/plugins/ha/ha_ike.h b/src/libcharon/plugins/ha/ha_ike.h
similarity index 100%
rename from src/charon/plugins/ha/ha_ike.h
rename to src/libcharon/plugins/ha/ha_ike.h
diff --git a/src/charon/plugins/ha/ha_kernel.c b/src/libcharon/plugins/ha/ha_kernel.c
similarity index 100%
rename from src/charon/plugins/ha/ha_kernel.c
rename to src/libcharon/plugins/ha/ha_kernel.c
diff --git a/src/charon/plugins/ha/ha_kernel.h b/src/libcharon/plugins/ha/ha_kernel.h
similarity index 100%
rename from src/charon/plugins/ha/ha_kernel.h
rename to src/libcharon/plugins/ha/ha_kernel.h
diff --git a/src/charon/plugins/ha/ha_message.c b/src/libcharon/plugins/ha/ha_message.c
similarity index 100%
rename from src/charon/plugins/ha/ha_message.c
rename to src/libcharon/plugins/ha/ha_message.c
diff --git a/src/charon/plugins/ha/ha_message.h b/src/libcharon/plugins/ha/ha_message.h
similarity index 100%
rename from src/charon/plugins/ha/ha_message.h
rename to src/libcharon/plugins/ha/ha_message.h
diff --git a/src/charon/plugins/ha/ha_plugin.c b/src/libcharon/plugins/ha/ha_plugin.c
similarity index 100%
rename from src/charon/plugins/ha/ha_plugin.c
rename to src/libcharon/plugins/ha/ha_plugin.c
diff --git a/src/charon/plugins/ha/ha_plugin.h b/src/libcharon/plugins/ha/ha_plugin.h
similarity index 100%
rename from src/charon/plugins/ha/ha_plugin.h
rename to src/libcharon/plugins/ha/ha_plugin.h
diff --git a/src/charon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c
similarity index 100%
rename from src/charon/plugins/ha/ha_segments.c
rename to src/libcharon/plugins/ha/ha_segments.c
diff --git a/src/charon/plugins/ha/ha_segments.h b/src/libcharon/plugins/ha/ha_segments.h
similarity index 100%
rename from src/charon/plugins/ha/ha_segments.h
rename to src/libcharon/plugins/ha/ha_segments.h
diff --git a/src/charon/plugins/ha/ha_socket.c b/src/libcharon/plugins/ha/ha_socket.c
similarity index 100%
rename from src/charon/plugins/ha/ha_socket.c
rename to src/libcharon/plugins/ha/ha_socket.c
diff --git a/src/charon/plugins/ha/ha_socket.h b/src/libcharon/plugins/ha/ha_socket.h
similarity index 100%
rename from src/charon/plugins/ha/ha_socket.h
rename to src/libcharon/plugins/ha/ha_socket.h
diff --git a/src/charon/plugins/ha/ha_tunnel.c b/src/libcharon/plugins/ha/ha_tunnel.c
similarity index 100%
rename from src/charon/plugins/ha/ha_tunnel.c
rename to src/libcharon/plugins/ha/ha_tunnel.c
diff --git a/src/charon/plugins/ha/ha_tunnel.h b/src/libcharon/plugins/ha/ha_tunnel.h
similarity index 100%
rename from src/charon/plugins/ha/ha_tunnel.h
rename to src/libcharon/plugins/ha/ha_tunnel.h