+ remove expat deps

+ correct includes

src/SConscript

@@ -38,10 +38,6 @@ regex = 'boost_regex%s' % env['BOOST_APPEND']
 
 libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj',env['ICU_LIB_NAME'],filesystem,regex]
 
-### WARNING! temp solution.
-libraries.append('expat')
-###
-
 if '-DHAVE_CAIRO' in env['CXXFLAGS']:
     # add cairo and cairomm-1.0 to libs
     libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])
@@ -121,8 +117,8 @@ source = Split(
 if True :
     source += Split(
         """
-    agg_svg_parser.cpp
     agg_svg_path_renderer.cpp
+    svg_parser.cpp
     svg_path_parser.cpp
     svg_points_parser.cpp 
     svg_transform_parser.cpp

src/marker_cache.cpp

@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/svg/marker_cache.hpp>
-#include <mapnik/svg/agg_svg_parser.h>
+#include <mapnik/svg/svg_parser.hpp>
 
 // boost
 #include <boost/assert.hpp>
@@ -65,10 +65,11 @@ boost::optional<path_ptr> marker_cache::find(std::string const& uri, bool update
 	try 
 	{
 	    mapnik::path_ptr marker(new agg::svg::path_renderer);
-	    agg::svg::parser p(*marker);
+	    svg::svg_parser p(*marker);
+	    p.parse(uri);            
 	    marker->arrange_orientations();
-	    p.parse(uri.c_str());
-	    //marker->bounding_rect(&lox, &loy, &hix, &hiy);
+	    double lox,loy,hix,hiy;
+	    marker->bounding_rect(&lox, &loy, &hix, &hiy); //TODO: store bbox!
 	    if (update_cache)
 	    {
 		cache_.insert(std::make_pair(uri,marker));

src/svg_parser.cpp

@@ -21,10 +21,10 @@
  *****************************************************************************/
 
 #include <mapnik/color_factory.hpp>
+#include <mapnik/svg/svg_parser.hpp>
+#include <mapnik/svg/svg_path_parser.hpp>
 
-#include "svg_parser.hpp"
-#include "svg_path_parser.hpp"
-
+#include "agg_color_rgba.h"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/foreach.hpp>