Index: Makefile.in
--- Makefile.in.orig	2009-11-06 15:49:23 +0100
+++ Makefile.in	2009-11-06 20:22:53 +0100
@@ -813,7 +813,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = lib po gl src examples tests doc gltests
+SUBDIRS = po gl src
 EXTRA_DIST = cfg.mk maint.mk .clcopying
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/m4 -I lib/gl/m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete
Index: src/Makefile.in
--- src/Makefile.in.orig	2009-11-06 15:49:22 +0100
+++ src/Makefile.in	2009-11-06 20:23:58 +0100
@@ -147,7 +147,7 @@
 	callbacks.$(OBJEXT)
 gsasl_OBJECTS = $(am_gsasl_OBJECTS)
 am__DEPENDENCIES_1 =
-gsasl_DEPENDENCIES = ../lib/src/libgsasl.la ../gl/libgl.la \
+gsasl_DEPENDENCIES = ../gl/libgl.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libgsasl_cmd.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -796,7 +796,7 @@
 	imap.c imap.h smtp.c smtp.h \
 	callbacks.h callbacks.c internal.h
 
-gsasl_LDADD = ../lib/src/libgsasl.la ../gl/libgl.la \
+gsasl_LDADD = @LDFLAGS@ @LIBS@ ../gl/libgl.la \
 	$(LTLIBREADLINE) $(LTLIBGNUTLS) $(LIBSOCKET) $(LTLIBINTL) \
 	libgsasl_cmd.la