From c258a3b36af95d9d415ae7f5d9a75a3b62e02f63 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Tue, 21 Apr 2009 15:24:02 +0000
Subject: [PATCH] fixed pluto/scepclient out-of-tree builds

---
 src/pluto/Makefile.am      | 4 ++--
 src/scepclient/Makefile.am | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 30ac5dab4..822642b9a 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -67,14 +67,14 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
 
 _pluto_adns_SOURCES = adns.c adns.h
 
-LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+LIBSTRONGSWANDIR=$(top_builddir)/src/libstrongswan
 LIBFREESWANDIR=$(top_builddir)/src/libfreeswan
 LIBCRYPTODIR=$(top_builddir)/src/libcrypto
 
 
 INCLUDES = \
 -I${linuxdir} \
--I$(LIBSTRONGSWANDIR)\
+-I$(top_srcdir)/src/libstrongswan \
 -I$(top_srcdir)/src/libfreeswan \
 -I$(top_srcdir)/src/libcrypto \
 -I$(top_srcdir)/src/whack
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 92d271ce0..716f01f09 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -21,6 +21,7 @@ AM_CFLAGS = \
 -DDEBUG -DNO_PLUTO \
 -Wformat=0
 
+LIBSTRONGSWANBUILDDIR=$(top_builddir)/src/libstrongswan
 LIBFREESWANBUILDDIR=$(top_builddir)/src/libfreeswan
 LIBCRYPTOBUILDDIR=$(top_builddir)/src/libcrypto
 
@@ -28,7 +29,7 @@ scepclient_LDADD = \
 ca.o crl.o certs.o constants.o defs.o fetch.o id.o keys.o lex.o library.o \
 md2.o md5.o mp_defs.o ocsp.o pem.o pgp.o pkcs1.o pkcs7.o rnd.o sha1.o \
 smartcard.o x509.o \
-$(LIBSTRONGSWANDIR)/libstrongswan.la \
+$(LIBSTRONGSWANBUILDDIR)/libstrongswan.la \
 $(LIBFREESWANBUILDDIR)/libfreeswan.a \
 $(LIBCRYPTOBUILDDIR)/libcrypto.a \
 -lgmp