4 files changed, 3 insertions, 5 deletions
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 54fc76467..525b20190 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -105,8 +105,7 @@ credentials/credential_set.h
 INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
 AM_CFLAGS = -rdynamic \
   -DIPSEC_DIR=\"${ipsecdir}\" \
-  -DIPSEC_PIDDIR=\"${piddir}\" \
-  -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
+  -DIPSEC_PIDDIR=\"${piddir}\"
 charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) $(SOCKLIB)
 
 # compile options
diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index 258043032..a1ec3adef 100644
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -684,7 +684,7 @@ int main(int argc, char *argv[])
 	dbg = dbg_stderr;
 
 	/* initialize library */
-	if (!library_init(STRONGSWAN_CONF))
+	if (!library_init(NULL))
 	{
 		library_deinit();
 		exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am
index bbbc5a2e5..c6a382c4e 100644
--- a/src/charon/plugins/sql/Makefile.am
+++ b/src/charon/plugins/sql/Makefile.am
@@ -2,7 +2,6 @@
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
 
 AM_CFLAGS = -rdynamic \
-  -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
   -DPLUGINS=\""${libstrongswan_plugins}\""
 
 plugin_LTLIBRARIES = libstrongswan-sql.la
diff --git a/src/charon/plugins/sql/pool.c b/src/charon/plugins/sql/pool.c
index d59c4c811..55d82dac7 100644
--- a/src/charon/plugins/sql/pool.c
+++ b/src/charon/plugins/sql/pool.c
@@ -624,7 +624,7 @@ int main(int argc, char *argv[])
 	atexit(library_deinit);
 
 	/* initialize library */
-	if (!library_init(STRONGSWAN_CONF))
+	if (!library_init(NULL))
 	{
 		exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
 	}