--- font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
+++ font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -4,8 +4,9 @@
 agginclude_HEADERS = agg_font_freetype.h
 lib_LTLIBRARIES = libaggfontfreetype.la
 
-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
 libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
+libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
 endif
 
--- src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
+++ src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -5,6 +5,6 @@
 libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
 libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
+libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
 endif
 
--- configure.in	2006-10-09 05:06:36.000000000 +0100
+++ configure.in	2007-01-07 14:07:39.000000000 +0000
@@ -122,7 +122,8 @@
 fi
 AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
 AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
+test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
+AC_SUBST(X_LDFLAGS)
 dnl ###############################################
 
 dnl Settung up library version
--- src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
+++ src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
@@ -1,8 +1,8 @@
 if ENABLE_X11
 lib_LTLIBRARIES = libaggplatformX11.la
 
-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L@x_libraries@
+libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
 libaggplatformX11_la_SOURCES = agg_platform_support.cpp
 libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I@x_includes@
-libaggplatformX11_la_LIBADD = -lX11
+libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
 endif
