]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Enable shared libopenconnect for Android build
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 11 Mar 2013 14:02:01 +0000 (14:02 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 11 Mar 2013 14:03:17 +0000 (14:03 +0000)
We'll definitely want to use it from Java code for the authentication stage.
Not entirely sure yet how we'll invoke the main loop — perhaps by executing
the openconnect executable, but we *could* also invoke the main loop directly
from a Java process too. That might simplify the issue of protecting the
network sockets.

This ends up pulling libxml into libopenconnect.so, so the openconnect
executable gets it from there. Which isn't an ideal setup for the general
case but it's fairly convenient on Android.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
android/Makefile

index 75536de61746b6aed77d0cdf6c641b828c490e4a..633f2e73b22f0905eba1138fe53ee12887363500 100644 (file)
@@ -248,7 +248,7 @@ $(OPENCONNECT_BUILD)/Makefile: $(GNUTLS_DEPS) $(LIBXML_DEPS) ../configure
        mkdir -p $(OPENCONNECT_BUILD)
        cd $(OPENCONNECT_BUILD) && ../../../configure $(CONFIGURE_ARGS) \
        CFLAGS="--sysroot=$(NDK_SYSROOT) -DNO_BROKEN_DTLS_CHECK -DANDROID" \
-       GNUTLS_LIBS="$(shell PKG_CONFIG_LIBDIR=$(OC_SYSROOT)/lib/pkgconfig pkg-config --static --libs gnutls)"
+       GNUTLS_LIBS="$(shell PKG_CONFIG_LIBDIR=$(OC_SYSROOT)/lib/pkgconfig pkg-config --static --libs gnutls)" --enable-shared
 
 openconnect: $(OPENCONNECT_BUILD)/Makefile
        make -C $(OPENCONNECT_BUILD)