diff -up mesa-demos-20100529/src/tests/Makefile.am.orig mesa-demos-20100529/src/tests/Makefile.am
--- mesa-demos-20100529/src/tests/Makefile.am.orig	2010-05-30 09:11:04.000000000 +1000
+++ mesa-demos-20100529/src/tests/Makefile.am	2010-05-30 11:19:49.000000000 +1000
@@ -169,13 +169,17 @@ endif
 
 afsmultiarb_LDADD = ../util/libutil.la
 arraytexture_LDADD = ../util/libutil.la
+auxbuffer_LDADD = -lX11
 bug_3195_LDADD = ../util/libutil.la
 bumpmap_LDADD = ../util/libutil.la
 floattex_LDADD = ../util/libutil.la
 fillrate_LDADD = ../util/libutil.la
 invert_LDADD = ../util/libutil.la
+jkrahntest_LDADD = -lX11
 mipmap_limits_LDADD = ../util/libutil.la
 mipmap_view_LDADD = ../util/libutil.la
+sharedtex_LDADD = -lX11
+texobjshare_LDADD = -lX11
 texrect_LDADD = ../util/libutil.la
 
 EXTRA_DIST = \
diff -up mesa-demos-20100529/src/xdemos/Makefile.am.orig mesa-demos-20100529/src/xdemos/Makefile.am
--- mesa-demos-20100529/src/xdemos/Makefile.am.orig	2010-05-30 14:41:55.000000000 +1000
+++ mesa-demos-20100529/src/xdemos/Makefile.am	2010-05-30 14:43:43.000000000 +1000
@@ -77,9 +77,11 @@ xrotfontdemo_SOURCES = \
 	xuserotfont.c \
 	xuserotfont.h
 
+glthreads_LDADD = -lpthread
 glxgears_fbconfig_LDADD = libpbutil.la
 pbdemo_LDADD = libpbutil.la
 pbinfo_LDADD = libpbutil.la
+sharedtex_mt_LDADD = -lpthread
 
 EXTRA_DIST = \
 	yuvrect_client.c \