Merge branch 'git-sam' into diego-sam-mwild-integration

Conflicts in options.c were just due to independent small functions
being close to each other.

unix.c in mwild was broken, it wasn't using LUASOCKET_API.

serial.c needed luaL_reg renamed, and to use LUASOCKET_API.

makefile didn't respect standard DESTDIR and prefix makefile
variables, and didn't allow LUAV variable to select lua version to build
against.

I've tested the top-level install-both target builds and installs
against both lua5.1 and lua5.2, but not done further testing.

Conflicts:
	README
	config
	gem/ltn012.tex
	makefile
	src/makefile
	src/options.c
	src/options.h
	src/tcp.c
	src/usocket.c

1 files changed, 6 insertions, 1 deletions

diff --git a/test/testsrvr.lua b/test/testsrvr.lua
index 7ddff6e..ff31442 100644
--- a/test/testsrvr.lua
+++ b/test/testsrvr.lua
@@ -7,7 +7,12 @@ while 1 do
     print("server: waiting for client connection...");
     control = assert(server:accept());
     while 1 do 
-        command = assert(control:receive());
+        command, emsg = control:receive();
+        if emsg == "closed" then
+            control:close()
+            break
+        end
+        assert(command, emsg)
         assert(control:send(ack));
         print(command);
                 (load(command))();