merged multi-auth branch back into trunk

2009-04-14 10:34:24 +00:00
parent 6e5c8d9413
commit a44bb9345f
230 changed files with 6163 additions and 4193 deletions
@@ -1,7 +1,12 @@
 ipsec_PROGRAMS = whack

 whack_SOURCES = whack.c whack.h
-INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto
+
+INCLUDES = \
+-I$(top_srcdir)/src/libstrongswan \
+-I$(top_srcdir)/src/libfreeswan \
+-I$(top_srcdir)/src/pluto
+
 whack_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a

 AM_CFLAGS = -DDEBUG