From dfc14c84800b8814e8deb9fdc60bb1d6fd1c0592 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sun, 20 Jan 2008 17:57:38 +0000
Subject: [PATCH] added --with-plugindir option

---
 configure.in | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 50e203f9b5..6d0ffbea4c 100644
--- a/configure.in
+++ b/configure.in
@@ -59,13 +59,6 @@ AC_ARG_WITH(
     [AC_DEFINE_UNQUOTED(DEV_URANDOM, "/dev/urandom")]
 )
 
-AC_ARG_WITH(
-    [ipsecdir],
-    AS_HELP_STRING([--with-ipsecdir=dir],[installation path for ipsec tools other than "libexecdir/ipsec"]),
-    [AC_SUBST(ipsecdir, "$withval")],
-    [AC_SUBST(ipsecdir, "${libexecdir}/ipsec")]
-)
-
 AC_ARG_WITH(
     [piddir],
     AS_HELP_STRING([--with-piddir=dir],[path for PID and UNIX socket files other than "/var/run"]),
@@ -73,31 +66,46 @@ AC_ARG_WITH(
     [AC_SUBST(piddir, "/var/run")]
 )
 
+AC_ARG_WITH(
+    [ipsecdir],
+    AS_HELP_STRING([--with-ipsecdir=dir],[installation path for ipsec tools other than "libexecdir/ipsec"]),
+    [AC_SUBST(ipsecdir, "$withval")],
+    [AC_SUBST(ipsecdir, "${libexecdir}/ipsec")]
+)
+
+AC_ARG_WITH(
+    [plugindir],
+    AS_HELP_STRING([--with-plugindir=dir],[installation path for plugins other than "ipsecdir/plugins"]),
+    [AC_SUBST(plugindir, "$withval")],
+    [AC_SUBST(plugindir, "${ipsecdir}/plugins")]
+)
+
 AC_ARG_WITH(
     [eapdir],
-    AS_HELP_STRING([--with-eapdir=dir],[path for pluggable EAP modules other than "ipsecdir/plugins/eap"]),
+    AS_HELP_STRING([--with-eapdir=dir],[path for pluggable EAP modules other than "plugindir/eap"]),
     [AC_SUBST(eapdir, "$withval")],
-    [AC_SUBST(eapdir, "${ipsecdir}/plugins/eap")]
+    [AC_SUBST(eapdir, "${plugindir}/eap")]
 )
 
 AC_ARG_WITH(
     [backenddir],
-    AS_HELP_STRING([--with-backenddir=dir],[path for pluggable configuration backend modules other than "ipsecdir/plugins/backends"]),
+    AS_HELP_STRING([--with-backenddir=dir],[path for pluggable configuration backend modules other than "plugindir/backends"]),
     [AC_SUBST(backenddir, "$withval")],
-    [AC_SUBST(backenddir, "${ipsecdir}/plugins/backends")]
+    [AC_SUBST(backenddir, "${plugindir}/backends")]
 )
 
 AC_ARG_WITH(
     [interfacedir],
-    AS_HELP_STRING([--with-interfacedir=dir],[path for pluggable control interface modules other than "ipsecdir/plugins/interfaces"]),
+    AS_HELP_STRING([--with-interfacedir=dir],[path for pluggable control interface modules other than "plugindir/interfaces"]),
     [AC_SUBST(interfacedir, "$withval")],
-    [AC_SUBST(interfacedir, "${ipsecdir}/plugins/interfaces")]
+    [AC_SUBST(interfacedir, "${plugindir}/interfaces")]
 )
 
 AC_ARG_WITH(
     [sim-reader],
-    AS_HELP_STRING([--with-sim-reader=library.so],[library containing the sim_run_alg() function for EAP-SIM]),
-    [AC_DEFINE_UNQUOTED(SIM_READER_LIB, "$withval")]
+    AS_HELP_STRING([--with-sim-reader=library.so],[library containing the sim_run_alg()/sim_get_triplet() function for EAP-SIM]),
+    [AC_SUBST(simreader, "$withval")],
+    [AC_SUBST(simreader, "${plugindir}/libcharon-eapsim-file.so")]
 )
 
 AC_ARG_WITH(