summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 \