From 469ae2c2bea5e619e5632e53bfb5da8da31dd1b2 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Fri, 11 Apr 2014 11:08:49 +0200 Subject: build: curvetun: add NACL_LIB variable to configure to be able to set an alternative lib This way one can simply set an alternative lib like libsodium for linking the curvetun binary. The current default linking against libnacl is preserved! To link curvetun against libsodium you can set NACL_LIB=sodium Signed-off-by: Christian Wiese Signed-off-by: Daniel Borkmann --- configure | 5 +++++ curvetun/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9b5ea9e..68291d2 100755 --- a/configure +++ b/configure @@ -119,6 +119,10 @@ EOF NACL_LIB_DIR="/usr/lib" fi + if [ -z $NACL_LIB ] ; then + NACL_LIB="nacl" + fi + LDFLAGS="-L $NACL_LIB_DIR" CFLAGS="-I $NACL_INC_DIR" @@ -131,6 +135,7 @@ EOF echo "[YES]" echo "CONFIG_NACL_INC_DIR:=$NACL_INC_DIR" >> Config echo "CONFIG_NACL_LIB_DIR:=$NACL_LIB_DIR" >> Config + echo "CONFIG_NACL_LIB:=$NACL_LIB" >> Config fi } diff --git a/curvetun/Makefile b/curvetun/Makefile index 6d996b0..eeebd11 100644 --- a/curvetun/Makefile +++ b/curvetun/Makefile @@ -1,4 +1,4 @@ -curvetun-libs = -lnacl \ +curvetun-libs = -l${CONFIG_NACL_LIB} \ -lpthread curvetun-objs = xmalloc.o \ -- cgit v1.2.3-54-g00ecf