diff -Naur old/configure new/configure
--- old/configure	Mon Oct  7 21:26:18 2002
+++ new/configure	Wed Mar 26 04:13:49 2003
@@ -8237,7 +8237,7 @@
 test=NONE
 libggz_libdir=NONE
 for dir in $libggz_libdirs; do
-  try="ls -1 $dir/libggz.so"
+  try="ls -1 $dir/libggz.dylib"
   if test -n "`$try 2> /dev/null`"; then libggz_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
 done
 
@@ -9984,6 +9984,9 @@
 fi
 
 if test "$database" = db3; then
+		cat >>confdefs.h <<\_ACEOF
+#define DB3_IN_DIR 1
+_ACEOF
     database=db3
     db3_style=-1
     echo "$as_me:$LINENO: checking for db_env_create in -ldb" >&5
diff -Naur old/game_servers/ggzcards/ai.c new/game_servers/ggzcards/ai.c
--- old/game_servers/ggzcards/ai.c	Tue Oct  1 16:16:35 2002
+++ new/game_servers/ggzcards/ai.c	Wed Mar 26 04:51:00 2003
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "ai.h"
 #include "common.h"
diff -Naur old/game_servers/keepalive/src/Makefile.in new/game_servers/keepalive/src/Makefile.in
--- old/game_servers/keepalive/src/Makefile.in	Mon Oct  7 21:26:02 2002
+++ new/game_servers/keepalive/src/Makefile.in	Wed Mar 26 18:18:47 2003
@@ -128,7 +128,7 @@
 ggzdexecmod_PROGRAMS = keepalivesrv
 
 keepalivesrv_SOURCES = main.cpp keepalive.cpp player.cpp world.cpp spectator.cpp
-keepalivesrv_LDADD = $(top_builddir)/ggzdmod/libggzdmod.la
+keepalivesrv_LDADD = $(top_builddir)/ggzdmod/libggzdmod.la -lgnugetopt
 
 noinst_HEADERS = keepalive.h player.h world.h protocol.h spectator.h
 
diff -Naur old/game_servers/muehle/Makefile.in new/game_servers/muehle/Makefile.in
--- old/game_servers/muehle/Makefile.in	Mon Oct  7 21:26:05 2002
+++ new/game_servers/muehle/Makefile.in	Wed Mar 26 17:27:56 2003
@@ -135,7 +135,8 @@
 muehleserv_LDADD = $(LDADD) \
 			ggz/libggzgameserver.a \
 			qtserv/libqtserv.a \
-			$(top_builddir)/ggzdmod/libggzdmod.la
+			$(top_builddir)/ggzdmod/libggzdmod.la \
+			-lgnugetopt
 
 
 noinst_HEADERS = muehleserver.h loader.h net.h
diff -Naur old/ggzd/Makefile.in new/ggzd/Makefile.in
--- old/ggzd/Makefile.in	Mon Oct  7 21:26:10 2002
+++ new/ggzd/Makefile.in	Wed Mar 26 02:33:30 2003
@@ -180,7 +180,7 @@
 INCLUDES = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES)
 
 ggzd_LDFLAGS = $(LIBGGZ_LDFLAGS)
-ggzd_LDADD = $(LDADD) $(ggzd_LIBS) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ)
+ggzd_LDADD = $(LDADD) $(ggzd_LIBS) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) -lpoll
 
 ggzduedit_SOURCES = ggzduedit.c \
 		    $(DBSOURCES) \
diff -Naur old/ggzd/client.c new/ggzd/client.c
--- old/ggzd/client.c	Mon Oct  7 18:59:41 2002
+++ new/ggzd/client.c	Wed Mar 26 04:46:48 2003
@@ -129,11 +129,12 @@
 
 	rc = -1;
 	if (opt.perform_lookups) {
-		rc = gethostbyaddr_r(&addr.sin_addr, sizeof(struct in_addr),
-				     AF_INET, &hostbuf, tmphstbuf, 1024, &hp, &herr);
+		hp = gethostbyaddr(&addr.sin_addr, sizeof(struct in_addr),
+				     AF_INET /* , &hostbuf, tmphstbuf, 1024, &hp, &herr */ );
 		/* Note if we get an error we don't bother expanding the */
 		/* buffer or so forth. Is the hostname vs. IP that important? */
-		if(rc == 0) {
+		if(hp == 0) {
+			hostbuf = *hp;
 			strncpy(client->addr, hostbuf.h_name, sizeof(client->addr));
 			client->addr[sizeof(client->addr)-1] = '\0';
 		}
diff -Naur old/ggzd/control.c new/ggzd/control.c
--- old/ggzd/control.c	Mon Oct  7 17:29:28 2002
+++ new/ggzd/control.c	Wed Mar 26 02:25:59 2003
@@ -54,6 +54,7 @@
 #include "client.h"
 #include "util.h"
 
+typedef	unsigned int socklen_t;
 
 /* Server options */
 Options opt;
diff -Naur old/ggzd/util.c new/ggzd/util.c
--- old/ggzd/util.c	Mon Sep 16 00:28:11 2002
+++ new/ggzd/util.c	Wed Mar 26 04:21:08 2003
@@ -27,11 +27,11 @@
 # include <config.h>		/* Site specific config */
 #endif
 
+#include <sys/types.h>
 #include <dirent.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "err_func.h"
 #include "util.h"