summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Wiese <chris@opensde.org>2014-04-11 11:08:49 +0200
committerDaniel Borkmann <dborkman@redhat.com>2014-04-11 12:06:43 +0200
commit469ae2c2bea5e619e5632e53bfb5da8da31dd1b2 (patch)
tree590887786b9aa20fb3d0bd15c3502c3d0e1f5eee
parent453f6eb9d79dd5aa2812ef956b22723f0a493086 (diff)
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 <chris@opensde.org> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rwxr-xr-xconfigure5
-rw-r--r--curvetun/Makefile2
2 files changed, 6 insertions, 1 deletions
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 \