--- demo/viewer/viewer.pro.orig	2010-01-25 21:49:14.672379007 -0500
+++ demo/viewer/viewer.pro	2010-01-25 21:50:53.228378920 -0500
@@ -8,11 +8,12 @@
 INCLUDEPATH += /opt/boost/include/boost-1_39
 INCLUDEPATH += /usr/X11/include/
 INCLUDEPATH += /usr/X11/include/freetype2
+INCLUDEPATH += /usr/include/freetype2
+INCLUDEPATH += /usr/include/agg2
 INCLUDEPATH += .
 
 QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers'
-unix:LIBS =  -L/opt/mapnik/lib -L/usr/X11/lib -lmapnik -lfreetype -L/usr/local/lib -licuuc
-unix:LIBS += -lboost_system -lboost_filesystem -lboost_regex -L/opt/boost/lib
+unix:LIBS =  -L/opt/mapnik/lib -L/usr/X11/lib -lmapnik -lfreetype -L/usr/local/lib -licuuc -lagg -lboost_system-mt -lboost_program_options-mt -lboost_iostreams-mt -lboost_filesystem-mt
 
 # Input