summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-01-10 00:17:29 +0000
committerChristian Pointner <equinox@anytun.org>2009-01-10 00:17:29 +0000
commita3497b930872853c792605b3d08529316cc8413a (patch)
tree382e218703f2fed55ecce10d839da5a476ad3ed0
parentimproved Makefile and configure script (diff)
no crypto wokrs now with new build scripts
-rw-r--r--src/Makefile5
-rwxr-xr-xsrc/configure3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index f5eea2c..ef90eeb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,7 +38,7 @@ DEPENDFILE = .depend
EXECUTABLE = uanytun
CRYPT_OBJ = key_derivation.o \
- auth_algo.o
+ auth_algo.o
OBJ = log.o \
signal.o \
options.o \
@@ -50,7 +50,10 @@ OBJ = log.o \
cipher.o \
uanytun.o
+
+ifndef NO_CRYPT_OBJ
OBJ += $(CRYPT_OBJ)
+endif
SRC = $(OBJ:%.o=%.c)
diff --git a/src/configure b/src/configure
index 3246ca0..1664f30 100755
--- a/src/configure
+++ b/src/configure
@@ -78,7 +78,7 @@ case $TARGET in
echo "loading BSD specific TUN Device"
CFLAGS=$CFLAGS' -I/usr/local/include'
LDFLAGS=$LDFLAGS' -L/usr/local/lib'
- if [ '$TARGET' == 'OpenBSD' ]; then
+ if [ "$TARGET" == 'OpenBSD' ]; then
V4_MAPPED=0
fi
;;
@@ -101,6 +101,7 @@ case $CRYPTO_LIB in
;;
none)
CFLAGS=$CFLAGS' -DNO_CRYPT'
+ echo "NO_CRYPT_OBJ = 1" >> include.mk
echo "Disabling crypto"
;;
esac