diff -Naur strongswan-4.4.1-orig/src/libcharon/Makefile.am strongswan-4.4.1/src/libcharon/Makefile.am
--- strongswan-4.4.1-orig/src/libcharon/Makefile.am	2010-07-21 19:40:16.000000000 +0000
+++ strongswan-4.4.1/src/libcharon/Makefile.am	2010-09-22 19:24:12.177969130 +0000
@@ -107,6 +107,11 @@
 	-DIPSEC_PIDDIR=\"${piddir}\"
 
 libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
+if USE_INTEGRITY_TEST
+else
+libcharon_la_LIBADD += $(top_builddir)/src/libstrongswan/libstrongswan.la
+libcharon_la_LIBADD += $(top_builddir)/src/libhydra/libhydra.la
+endif
 
 EXTRA_DIST = Android.mk
 
diff -Naur strongswan-4.4.1-orig/src/libhydra/Makefile.am strongswan-4.4.1/src/libhydra/Makefile.am
--- strongswan-4.4.1-orig/src/libhydra/Makefile.am	2010-07-21 19:40:17.000000000 +0000
+++ strongswan-4.4.1/src/libhydra/Makefile.am	2010-09-22 19:23:34.531740498 +0000
@@ -7,7 +7,11 @@
 attributes/attribute_manager.c attributes/attribute_manager.h \
 attributes/mem_pool.c attributes/mem_pool.h
 
+if USE_INTEGRITY_TEST
 libhydra_la_LIBADD =
+else
+libhydra_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+endif
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \