From: Kevin Cernekee Date: Mon, 25 Mar 2013 01:14:04 +0000 (-0700) Subject: android: Override vpnc-script check in "configure" X-Git-Tag: v5.00~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64d22bab3d903edc9fbb8c4c33b696e49744f04a;p=users%2Fdwmw2%2Fopenconnect.git android: Override vpnc-script check in "configure" If we're cross compiling for some other target, we don't particularly care whether the build host has a valid vpnc-script installed locally. Signed-off-by: Kevin Cernekee Signed-off-by: David Woodhouse --- diff --git a/android/Makefile b/android/Makefile index 0ef95cd1..93f82901 100644 --- a/android/Makefile +++ b/android/Makefile @@ -249,7 +249,8 @@ $(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" \ - GNUTLS_LIBS="$(shell PKG_CONFIG_LIBDIR=$(OC_SYSROOT)/lib/pkgconfig pkg-config --static --libs gnutls)" --enable-shared + GNUTLS_LIBS="$(shell PKG_CONFIG_LIBDIR=$(OC_SYSROOT)/lib/pkgconfig pkg-config --static --libs gnutls)" \ + --enable-shared --with-vpnc-script=/etc/vpnc/vpnc-script openconnect: $(OPENCONNECT_BUILD)/Makefile make -C $(OPENCONNECT_BUILD)