diff -Nurd ekg-1.7/Makefile.in ekg-1.7-patched/Makefile.in
--- ekg-1.7/Makefile.in	2006-08-05 11:46:21.000000000 -0400
+++ ekg-1.7-patched/Makefile.in	2009-10-08 14:44:47.000000000 -0400
@@ -15,7 +15,7 @@
 
 #
 
-all:	configure libgadu @ekg@ @make_ekgwap@
+all:	configure @ekg@ @make_ekgwap@
 
 libgadu:
 	cd lib && $(MAKE) all
@@ -31,7 +31,7 @@
 
 #
 
-dep:	dep-libgadu @dep_ekg@
+dep:	@dep_ekg@
 
 dep-libgadu:
 	cd lib && $(MAKE) dep
@@ -46,7 +46,7 @@
 
 #
 
-install:	all install-libgadu @install_ekg@ @install_ekgwap@
+install:	all @install_ekg@ @install_ekgwap@
 
 install-libgadu:
 	cd lib && $(MAKE) install
diff -Nurd ekg-1.7/configure ekg-1.7-patched/configure
--- ekg-1.7/configure	2007-04-28 16:57:00.000000000 -0400
+++ ekg-1.7-patched/configure	2009-10-08 14:41:28.000000000 -0400
@@ -5437,7 +5437,7 @@
 		# FIXME: -fPIC is required for -shared on many architectures,
 		# so we specify it here, but the right way would probably be to
 		# properly detect whether it is actually required.
-		CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
+		CFLAGS="-dynamiclib -fPIC $CFLAGS $PTHREAD_CFLAGS"
 		LIBS="$PTHREAD_LIBS $LIBS"
 		CC="$PTHREAD_CC"
 
@@ -8766,7 +8766,7 @@
    { (exit 1); exit 1; }; }
 	fi
 
-	LDFLAGS="$READLINE_LIBS $LDFLAGS"
+	LDFLAGS="$LDFLAGS $READLINE_LIBS"
 	CFLAGS="$CFLAGS $READLINE_INCLUDES"
 
 
@@ -10037,7 +10037,7 @@
 			PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
 			PY_OTHER_LIBM=`sed -n -e 's/^LIBC=\(.*\)/\1/p' $PY_MAKEFILE`
 			PY_OTHER_LIBC=`sed -n -e 's/^LIBM=\(.*\)/\1/p' $PY_MAKEFILE`
-			PY_LINKFORSHARED="$(python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')")"
+			PY_LINKFORSHARED="$($PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')")"
 			PY_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS $PY_OTHER_LIBC $PY_OTHER_LIBM $PY_LINKFORSHARED"
 
 			PYTHON_LIBS="-L$PY_EXEC_PREFIX/lib $PY_LIB_LOC -lpython$PY_VERSION $PY_LIBS"
@@ -10060,7 +10060,7 @@
 
 if test "x$have_python" = "xyes"; then
 	OBJS="$OBJS python.o"
-	LDFLAGS="$PYTHON_LIBS $LDFLAGS"
+	LDFLAGS="$LDFLAGS $PYTHON_LIBS"
 	CFLAGS="$CFLAGS $PYTHON_INCLUDES"
 fi
 
diff -Nurd ekg-1.7/examples/Makefile.in ekg-1.7-patched/examples/Makefile.in
--- ekg-1.7/examples/Makefile.in	2003-06-24 16:56:52.000000000 -0400
+++ ekg-1.7-patched/examples/Makefile.in	2009-10-08 14:41:28.000000000 -0400
@@ -1,6 +1,6 @@
 # $Id: Makefile.in,v 1.13 2003-06-24 20:56:52 wojtekka Exp $
 
-CC = @CC@
+CC = glibtool --tag=CC --mode=link @CC@
 CFLAGS = @CFLAGS_LIBGADU@ @CFLAGS@ -I.. -I../lib -I../src
 LIBS = @LIBS_LIBGADU@
 MAKE = @MAKE@
diff -Nurd ekg-1.7/src/Makefile.in ekg-1.7-patched/src/Makefile.in
--- ekg-1.7/src/Makefile.in	2007-04-28 16:02:22.000000000 -0400
+++ ekg-1.7-patched/src/Makefile.in	2009-10-08 14:43:43.000000000 -0400
@@ -10,7 +10,7 @@
 sysconfdir = @sysconfdir@
 
 CC = @CC@ 
-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
+CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
@@ -26,12 +26,12 @@
 
 all:	dep ekg @ioctld@
 
-ekg:	$(OBJS) comptime.c @libgadu_a@
-	$(CC) $(CFLAGS) -c -o comptime.o comptime.c
-	$(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ekg:	$(OBJS) comptime.c
+	glibtool --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o comptime.lo comptime.c
+	glibtool --tag=CC --mode=link $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.lo -lgadu $(LDFLAGS) $(LIBS)
 
 ioctld:	ioctld.c
-	$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
+	glibtool --tag=CC --mode=link $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
 
 dep:	.depend
 
@@ -44,17 +44,15 @@
 
 install-ekg:	@strip_ekg@
 	$(INSTALL) -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
+	glibtool --tag=CC --mode=install $(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
 
 install-ioctld:	@strip_ioctld@
 	$(INSTALL) -d $(DESTDIR)$(libexecdir)
-	$(INSTALL) -m 755 ioctld $(DESTDIR)$(libexecdir)
+	glibtool --tag=CC --mode=install $(INSTALL) -m 755 ioctld $(DESTDIR)$(libexecdir)
 
 strip-ekg:
-	$(STRIP) ekg
 
 strip-ioctld:
-	$(STRIP) ioctld
 
 #
 
diff -Nurd ekg-1.7/src/stuff.c ekg-1.7-patched/src/stuff.c
--- ekg-1.7/src/stuff.c	2007-04-28 16:02:24.000000000 -0400
+++ ekg-1.7-patched/src/stuff.c	2009-10-08 15:15:25.000000000 -0400
@@ -53,7 +53,6 @@
 #include <unistd.h>
 
 #include "commands.h"
-#include "compat.h"
 #include "dynstuff.h"
 #include "libgadu.h"
 #ifdef HAVE_OPENSSL