--- a/build.sh	Sun Dec 05 23:12:04 2010 +0100
+++ b/build.sh	Sat Jan 08 02:25:17 2011 +0100
@@ -1,16 +1,26 @@
 #!/bin/sh
+
+tar=tar
+
+if [ `uname -s` == "SunOS" ]; then
+	echo "Detected SunOS"
+	tar=gtar
+	CFLAGS="$CFLAGS -DSOLARIS -m64"
+	LDFLAGS="$LDFLAGS -lnsl -lsocket"
+fi
+
 echo Cleaning up...
 rm -rf out/ obj/ tmp/
 
 mkdir -p out
 echo Creating source archive...
-tar --transform "s,^\.,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" . --exclude "./out" --exclude "./lib" --exclude "./debian/data"
+$tar --transform "s,^\.,quicktun-`cat version`," -czf "out/quicktun-`cat version`.tgz" . --exclude "./out" --exclude "./lib" --exclude "./debian/data"
 
 mkdir -p obj tmp lib
 
-echo -n Checking for NaCl library...
+echo Checking for NaCl library...
 if [ ! -e lib/libnacl.a ]; then
-	echo -n building...
+	echo building...
 	mkdir tmp/nacl
 	cd tmp/nacl
 	wget -q -O- http://hyperelliptic.org/nacl/nacl-20090405.tar.bz2 | bunzip2 | tar -xf - --strip-components 1
@@ -27,31 +37,31 @@
 export LIBRARY_PATH=/usr/local/lib/:./lib/
 
 echo Building combined binary...
-gcc -c -DCOMBINED_BINARY	src/proto.raw.c		-o obj/proto.raw.o
-gcc -c -DCOMBINED_BINARY	src/crypto_scalarmult_curve25519.c	-o obj/crypto_scalarmult_curve25519.o 
-gcc -c -DCOMBINED_BINARY	src/proto.nacl0.c	-o obj/proto.nacl0.o
-gcc -c -DCOMBINED_BINARY	src/proto.nacltai.c	-o obj/proto.nacltai.o
-gcc -c -DCOMBINED_BINARY	src/run.combined.c	-o obj/run.combined.o
-gcc -c 				src/common.c		-o obj/common.o
-gcc -o out/quicktun.combined obj/common.o obj/run.combined.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/crypto_scalarmult_curve25519.o -lnacl
+gcc $CFLAGS -c -DCOMBINED_BINARY	src/proto.raw.c		-o obj/proto.raw.o
+gcc $CFLAGS -c -DCOMBINED_BINARY	src/crypto_scalarmult_curve25519.c	-o obj/crypto_scalarmult_curve25519.o
+gcc $CFLAGS -c -DCOMBINED_BINARY	src/proto.nacl0.c	-o obj/proto.nacl0.o
+gcc $CFLAGS -c -DCOMBINED_BINARY	src/proto.nacltai.c	-o obj/proto.nacltai.o
+gcc $CFLAGS -c -DCOMBINED_BINARY	src/run.combined.c	-o obj/run.combined.o
+gcc $CFLAGS -c 				src/common.c		-o obj/common.o
+gcc $CFLAGS -o out/quicktun.combined obj/common.o obj/run.combined.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/crypto_scalarmult_curve25519.o -lnacl $LDFLAGS
 
 echo Building single protocol binaries...
-gcc -o out/quicktun.raw		src/proto.raw.c
-gcc -o out/quicktun.nacl0	src/proto.nacl0.c	-lnacl
-gcc -o out/quicktun.nacltai	src/proto.nacltai.c src/crypto_scalarmult_curve25519.c	-lnacl
-gcc -o out/quicktun.keypair	src/keypair.c		-lnacl
+gcc $CFLAGS -o out/quicktun.raw		src/proto.raw.c $LDFLAGS
+gcc $CFLAGS -o out/quicktun.nacl0	src/proto.nacl0.c	-lnacl $LDFLAGS
+gcc $CFLAGS -o out/quicktun.nacltai	src/proto.nacltai.c src/crypto_scalarmult_curve25519.c	-lnacl $LDFLAGS
+gcc $CFLAGS -o out/quicktun.keypair	src/keypair.c		-lnacl $LDFLAGS
 
 echo Building shared libraries...
-gcc -fPIC -shared -Wl,-soname,quicktun.raw -o out/libquicktun.raw src/proto.raw.c
-##gcc -fPIC -shared -Wl,-soname,quicktun.nacl0 -o out/libquicktun.nacl0 src/proto.nacl0.c -lnacl
+gcc $CFLAGS -fPIC -shared -Wl,-soname,quicktun.raw -o out/libquicktun.raw src/proto.raw.c
+##gcc $CFLAGS -fPIC -shared -Wl,-soname,quicktun.nacl0 -o out/libquicktun.nacl0 src/proto.nacl0.c -lnacl $LDFLAGS
 
 ##echo Building frontends...
-##gcc -o out/quicktun.debian	src/run.debian.c -ldl
+##gcc $CFLAGS -o out/quicktun.debian	src/run.debian.c -ldl
 
 if [ -f /etc/network/interfaces ]; then
 	echo Building debian binary...
-	gcc -c -DCOMBINED_BINARY -DDEBIAN_BINARY src/run.combined.c -o obj/run.debian.o
-	gcc -o out/quicktun.debian obj/common.o obj/run.debian.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/crypto_scalarmult_curve25519.o -lnacl
+	gcc $CFLAGS -c -DCOMBINED_BINARY -DDEBIAN_BINARY src/run.combined.c -o obj/run.debian.o
+	gcc $CFLAGS -o out/quicktun.debian obj/common.o obj/run.debian.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/crypto_scalarmult_curve25519.o -lnacl $LDFLAGS
 	if [ -x /usr/bin/dpkg-deb -a -x /usr/bin/fakeroot ]; then
 		echo -n Building debian package...
 		cd debian