Couple script and environment fixes.

LGTM Ric.

Makefile

@@ -30,6 +30,7 @@ unit_test:
 	cd go/bytes2; go test
 	cd go/cache; go test
 	cd go/cgzip; go test
+	cd go/cmd/topo2topo; go test
 	cd go/cmd/zkns2pdns; go test
 	cd go/hack; go test
 #	cd go/logfile; go test
@@ -42,7 +43,6 @@ unit_test:
 	cd go/rpcwrap/auth; go test
 	cd go/stats; go test
 	cd go/timer; go test
-	cd go/topo2topo; go test
 	cd go/umgmt; go test
 	cd go/vt/client2; go test
 	cd go/vt/dbconfigs; go test

dev.env

@@ -60,9 +60,15 @@ if [ "$VT_MYSQL_ROOT" == "" ]; then
   fi
 fi 
 
+# mysql cgo library config
 export LD_LIBRARY_PATH=$(prepend_path $LD_LIBRARY_PATH $VT_MYSQL_ROOT/lib/mysql)
 export PKG_CONFIG_PATH=$(prepend_path $PKG_CONFIG_PATH $VTROOT/lib)
 
+# zookeeper cgo library config
+export CGO_CFLAGS="$CGO_CFLAGS -I$VTROOT/dist/vt-zookeeper-3.3.5/include/c-client-src"
+export CGO_LDFLAGS="$CGO_LDFLAGS -L$VTROOT/dist/vt-zookeeper-3.3.5/lib"
+export LD_LIBRARY_PATH=$(prepend_path $LD_LIBRARY_PATH $VTROOT/dist/vt-zookeeper-3.3.5/lib)
+
 export GOPATH=$(prepend_path $GOPATH $VTROOT)
 
 # Useful aliases. Remove if inconvenient.