From 60d62b9e5c8c256ce814bd6e7897bf694fc3b6d4 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 8 Jun 2011 15:49:15 +0200
Subject: [PATCH] Don't install the libraries directly in lib/.

Instead use a subdirectory (prefix/lib/ipsec by default). Also moved the
plugins from libexec to a subdirectory of that dir.
---
 configure.in                  | 3 ++-
 src/checksum/Makefile.am      | 2 +-
 src/dumm/Makefile.am          | 2 +-
 src/libcharon/Makefile.am     | 2 +-
 src/libfast/Makefile.am       | 2 +-
 src/libhydra/Makefile.am      | 2 +-
 src/libstrongswan/Makefile.am | 3 ++-
 src/libstrongswan/library.c   | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 87cad1b11..c790a4524 100644
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,8 @@ ARG_WITH_SUBST([strongswan-conf],    [${sysconfdir}/strongswan.conf], [set the s
 ARG_WITH_SUBST([resolv-conf],        [${sysconfdir}/resolv.conf], [set the file to use in DNS handler plugin])
 ARG_WITH_SUBST([piddir],             [/var/run], [set path for PID and UNIX socket files])
 ARG_WITH_SUBST([ipsecdir],           [${libexecdir%/}/ipsec], [set installation path for ipsec tools])
-ARG_WITH_SUBST([plugindir],          [${ipsecdir%/}/plugins], [set the installation path of plugins])
+ARG_WITH_SUBST([ipseclibdir],        [${libdir%/}/ipsec], [set installation path for ipsec libraries])
+ARG_WITH_SUBST([plugindir],          [${ipseclibdir%/}/plugins], [set the installation path of plugins])
 ARG_WITH_SUBST([nm-ca-dir],          [/usr/share/ca-certificates], [directory the NM plugin uses to look up trusted root certificates])
 ARG_WITH_SUBST([linux-headers],      [\${top_srcdir}/src/include], [set directory of linux header files to use])
 ARG_WITH_SUBST([routing-table],      [220], [set routing table to use for IPsec routes])
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index 600e72557..fc48438c2 100644
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -1,4 +1,4 @@
-ipsec_LTLIBRARIES = libchecksum.la
+ipseclib_LTLIBRARIES = libchecksum.la
 noinst_PROGRAMS = checksum_builder
 
 nodist_libchecksum_la_SOURCES = checksum.c
diff --git a/src/dumm/Makefile.am b/src/dumm/Makefile.am
index cc74a794f..8b8cebcd8 100644
--- a/src/dumm/Makefile.am
+++ b/src/dumm/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = ext/dumm.c ext/README \
   ext/lib/dumm.rb ext/lib/dumm/guest.rb
 
-lib_LTLIBRARIES = libdumm.la
+ipseclib_LTLIBRARIES = libdumm.la
 ipsec_PROGRAMS = dumm irdumm
 
 libdumm_la_SOURCES = dumm.c dumm.h guest.c guest.h iface.c iface.h \
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 8455604c1..f027937f7 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libcharon.la
+ipseclib_LTLIBRARIES = libcharon.la
 
 libcharon_la_SOURCES = \
 bus/bus.c bus/bus.h \
diff --git a/src/libfast/Makefile.am b/src/libfast/Makefile.am
index 5a1193658..575a06b73 100644
--- a/src/libfast/Makefile.am
+++ b/src/libfast/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libfast.la
+ipseclib_LTLIBRARIES = libfast.la
 
 libfast_la_SOURCES = context.h dispatcher.c request.h session.h \
   controller.h dispatcher.h request.c session.c filter.h smtp.c smtp.h
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index d0698d0f5..032dadaa3 100644
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libhydra.la
+ipseclib_LTLIBRARIES = libhydra.la
 
 libhydra_la_SOURCES = \
 hydra.c hydra.h \
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 626270020..ed07c4bdc 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libstrongswan.la
+ipseclib_LTLIBRARIES = libstrongswan.la
 
 libstrongswan_la_SOURCES = \
 library.c library.h \
@@ -80,6 +80,7 @@ libstrongswan_la_LIBADD = $(PTHREADLIB) $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB)
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
 -DIPSEC_DIR=\"${ipsecdir}\" \
+-DIPSEC_LIB_DIR=\"${ipseclibdir}\" \
 -DPLUGINDIR=\"${plugindir}\" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
 
diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c
index 9fc99e3a9..35d303f37 100644
--- a/src/libstrongswan/library.c
+++ b/src/libstrongswan/library.c
@@ -27,7 +27,7 @@
 #include <utils/leak_detective.h>
 #endif
 
-#define CHECKSUM_LIBRARY IPSEC_DIR"/libchecksum.so"
+#define CHECKSUM_LIBRARY IPSEC_LIB_DIR"/libchecksum.so"
 
 typedef struct private_library_t private_library_t;