[mapserver-commits] r9908 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2010-03-03 11:29:39 -0500 (Wed, 03 Mar 2010)
New Revision: 9908

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fixed --with-agg-svg-symbols to work as expected (#3344)

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2010-03-01 14:56:35 UTC (rev 9907)
+++ trunk/mapserver/configure	2010-03-03 16:29:39 UTC (rev 9908)
@@ -891,7 +891,7 @@
   --with-ftgl[=DIR]       Include OpenGl support (DIR is OpenGL's install dir).
   --with-opengl[=DIR]     Include OpenGl support (DIR is OpenGL's install dir).
   --with-agg[=DIR]        Include AGG support (DIR is AGG's install dir).
-  --with-arg-svg-symbols[=yes/no]
+  --with-agg-svg-symbols[=yes/no]
                           Include AGG SVG symbol support (Requires expat).
   --with-experimental-png Include experimental palette support for rgba png.
   --with-proj[=DIR]       Include PROJ.4 support (DIR is PROJ.4's install dir).
@@ -9221,14 +9221,13 @@
 
     AGG_ENABLED="-DUSE_AGG"
   AGG_INC="$FT_INC -Irenderers/agg/include"
- # AGG_OBJ="renderers/agg/src/agg_arc.o renderers/agg/src/agg_arrowhead.o renderers/agg/src/agg_bezier_arc.o renderers/agg/src/agg_bspline.o renderers/agg/src/agg_curves.o renderers/agg/src/agg_vcgen_contour.o renderers/agg/src/agg_vcgen_dash.o renderers/agg/src/agg_vcgen_markers_term.o renderers/agg/src/agg_vcgen_smooth_poly1.o renderers/agg/src/agg_vcgen_stroke.o renderers/agg/src/agg_vcgen_bspline.o renderers/agg/src/agg_gsv_text.o renderers/agg/src/agg_image_filters.o renderers/agg/src/agg_line_aa_basics.o renderers/agg/src/agg_line_profile_aa.o renderers/agg/src/agg_rounded_rect.o renderers/agg/src/agg_sqrt_tables.o renderers/agg/src/agg_embedded_raster_fonts.o renderers/agg/src/agg_trans_affine.o renderers/agg/src/agg_trans_warp_magnifier.o renderers/agg/src/agg_trans_single_path.o renderers/agg/src/agg_trans_double_path.o renderers/agg/src/agg_vpgen_clip_polygon.o renderers/agg/src/agg_vpgen_clip_polyline.o renderers/agg/src/agg_vpgen_segmentator.o renderers/agg/src/agg_font_freetype.o"
 
  AGG_OBJ="renderers/agg/src/agg_arc.o renderers/agg/src/agg_curves.o renderers/agg/src/agg_vcgen_contour.o renderers/agg/src/agg_vcgen_dash.o renderers/agg/src/agg_vcgen_stroke.o renderers/agg/src/agg_image_filters.o renderers/agg/src/agg_line_aa_basics.o renderers/agg/src/agg_line_profile_aa.o renderers/agg/src/agg_sqrt_tables.o renderers/agg/src/agg_embedded_raster_fonts.o renderers/agg/src/agg_trans_affine.o renderers/agg/src/agg_vpgen_clip_polygon.o renderers/agg/src/agg_vpgen_clip_polyline.o renderers/agg/src/agg_font_freetype.o"
 
- if test "$with_agg_svg_symbols" != "no" ; then
-	    AGG_OBJ="$AGG_OBJ renderers/agg/src/agg_svg_parser.o renderers/agg/src/agg_svg_path_renderer.o renderers/agg/src/agg_svg_path_tokenizer.o"
-	AGG_LIB=" -lexpat"
-	AGG_SVG_SYMBOLS_ENABLED="-DUSE_AGG_SVG_SYMBOLS"
+ if test "$with_agg_svg_symbols" = "yes" ; then
+        AGG_OBJ="$AGG_OBJ renderers/agg/src/agg_svg_parser.o renderers/agg/src/agg_svg_path_renderer.o renderers/agg/src/agg_svg_path_tokenizer.o"
+    AGG_LIB=" -lexpat"
+    AGG_SVG_SYMBOLS_ENABLED="-DUSE_AGG_SVG_SYMBOLS"
  fi
 else
 

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2010-03-01 14:56:35 UTC (rev 9907)
+++ trunk/mapserver/configure.in	2010-03-03 16:29:39 UTC (rev 9908)
@@ -962,7 +962,7 @@
 AC_ARG_WITH(agg,
 [  --with-agg[[=DIR]]        Include AGG support (DIR is AGG's install dir).],,)
 AC_ARG_WITH(agg-svg-symbols,
-[  --with-arg-svg-symbols[[=yes/no]]
+[  --with-agg-svg-symbols[[=yes/no]]
                           Include AGG SVG symbol support (Requires expat).],,)
 
 if test "$with_agg" != "no" ; then
@@ -984,15 +984,14 @@
   dnl If we got this far all is well!
   AGG_ENABLED="-DUSE_AGG"
   AGG_INC="$FT_INC -Irenderers/agg/include"
- # AGG_OBJ="renderers/agg/src/agg_arc.o renderers/agg/src/agg_arrowhead.o renderers/agg/src/agg_bezier_arc.o renderers/agg/src/agg_bspline.o renderers/agg/src/agg_curves.o renderers/agg/src/agg_vcgen_contour.o renderers/agg/src/agg_vcgen_dash.o renderers/agg/src/agg_vcgen_markers_term.o renderers/agg/src/agg_vcgen_smooth_poly1.o renderers/agg/src/agg_vcgen_stroke.o renderers/agg/src/agg_vcgen_bspline.o renderers/agg/src/agg_gsv_text.o renderers/agg/src/agg_image_filters.o renderers/agg/src/agg_line_aa_basics.o renderers/agg/src/agg_line_profile_aa.o renderers/agg/src/agg_rounded_rect.o renderers/agg/src/agg_sqrt_tables.o renderers/agg/src/agg_embedded_raster_fonts.o renderers/agg/src/agg_trans_affine.o renderers/agg/src/agg_trans_warp_magnifier.o renderers/agg/src/agg_trans_single_path.o renderers/agg/src/agg_trans_double_path.o renderers/agg/src/agg_vpgen_clip_polygon.o renderers/agg/src/agg_vpgen_clip_polyline.o renderers/agg/src/agg_vpgen_segmentator.o renderers/agg/src/agg_font_freetype.o"
  
  AGG_OBJ="renderers/agg/src/agg_arc.o renderers/agg/src/agg_curves.o renderers/agg/src/agg_vcgen_contour.o renderers/agg/src/agg_vcgen_dash.o renderers/agg/src/agg_vcgen_stroke.o renderers/agg/src/agg_image_filters.o renderers/agg/src/agg_line_aa_basics.o renderers/agg/src/agg_line_profile_aa.o renderers/agg/src/agg_sqrt_tables.o renderers/agg/src/agg_embedded_raster_fonts.o renderers/agg/src/agg_trans_affine.o renderers/agg/src/agg_vpgen_clip_polygon.o renderers/agg/src/agg_vpgen_clip_polyline.o renderers/agg/src/agg_font_freetype.o"
  
- if test "$with_agg_svg_symbols" != "no" ; then
-	dnl add SVG to the AGG build
+ if test "$with_agg_svg_symbols" = "yes" ; then
+    dnl add SVG to the AGG build
     AGG_OBJ="$AGG_OBJ renderers/agg/src/agg_svg_parser.o renderers/agg/src/agg_svg_path_renderer.o renderers/agg/src/agg_svg_path_tokenizer.o"
-	AGG_LIB=" -lexpat"
-	AGG_SVG_SYMBOLS_ENABLED="-DUSE_AGG_SVG_SYMBOLS"
+    AGG_LIB=" -lexpat"
+    AGG_SVG_SYMBOLS_ENABLED="-DUSE_AGG_SVG_SYMBOLS"
  fi
 else