[mapserver-commits] r13076 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2012-02-06 15:43:15 -0800 (Mon, 06 Feb 2012)
New Revision: 13076

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
   trunk/mapserver/nmake.opt
Log:
remove unused AGG svg symbol relics


Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2012-02-06 22:54:30 UTC (rev 13075)
+++ trunk/mapserver/configure	2012-02-06 23:43:15 UTC (rev 13076)
@@ -25120,12 +25120,10 @@
 $as_echo "  iconv support:             ${ICONV_ENABLED}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   AGG support:               ${AGG_ENABLED}" >&5
 $as_echo "  AGG support:               ${AGG_ENABLED}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   SVG Symbol support:        ${AGG_SVG_SYMBOLS_ENABLED}" >&5
-$as_echo "  SVG Symbol support:        ${AGG_SVG_SYMBOLS_ENABLED}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   Cairo (SVG,PDF) support:   ${CAIRO_ENABLED}" >&5
 $as_echo "  Cairo (SVG,PDF) support:   ${CAIRO_ENABLED}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   Cairo SVG parser support:  ${LIBSVG_CAIRO_ENABLED}" >&5
-$as_echo "  Cairo SVG parser support:  ${LIBSVG_CAIRO_ENABLED}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   Cairo SVG symbol support:  ${LIBSVG_CAIRO_ENABLED}" >&5
+$as_echo "  Cairo SVG symbol support:  ${LIBSVG_CAIRO_ENABLED}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   KML support:               ${KML_ENABLED}" >&5
 $as_echo "  KML support:               ${KML_ENABLED}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2012-02-06 22:54:30 UTC (rev 13075)
+++ trunk/mapserver/configure.in	2012-02-06 23:43:15 UTC (rev 13076)
@@ -2818,9 +2818,8 @@
 AC_MSG_RESULT([  freetype support:          ${FT_ENABLED}])
 AC_MSG_RESULT([  iconv support:             ${ICONV_ENABLED}])
 AC_MSG_RESULT([  AGG support:               ${AGG_ENABLED}])
-AC_MSG_RESULT([  SVG Symbol support:        ${AGG_SVG_SYMBOLS_ENABLED}])
 AC_MSG_RESULT([  Cairo (SVG,PDF) support:   ${CAIRO_ENABLED}])
-AC_MSG_RESULT([  Cairo SVG parser support:  ${LIBSVG_CAIRO_ENABLED}])
+AC_MSG_RESULT([  Cairo SVG symbol support:  ${LIBSVG_CAIRO_ENABLED}])
 AC_MSG_RESULT([  KML support:               ${KML_ENABLED}])
 AC_MSG_RESULT()
 

Modified: trunk/mapserver/nmake.opt
===================================================================
--- trunk/mapserver/nmake.opt	2012-02-06 22:54:30 UTC (rev 13075)
+++ trunk/mapserver/nmake.opt	2012-02-06 23:43:15 UTC (rev 13076)
@@ -781,11 +781,6 @@
 renderers\agg\src\agg_svg_path_tokenizer.obj renderers\agg\src\clipper.obj
 !ENDIF
 
-!IFDEF AGG_SVG_SYMBOL
-AGG_LIB= -lexpat
-AGG_OBJ=$(AGG_OBJ) renderers/agg/src/agg_svg_parser.obj renderers/agg/src/agg_svg_path_renderer.obj renderers/agg/src/agg_svg_path_tokenizer.obj
-!ENDIF
-
 # Setup PDF includes and libs
 !IFDEF PDF
 PDF_LIB=$(PDF_DIR)/libs/pdflib/Release_DLL/pdflib.lib
@@ -880,7 +875,7 @@
           $(WFS) $(WFSCLIENT) $(WCS) $(PDF) $(EGIS) \
           $(USE_GD_ANTIALIAS) $(ORACLE) \
           $(SDE_OPT) $(ICONV) $(GEOS) $(ZLIB) $(SOS)  $(XML2_ENABLED) $(AGG) \
-          $(OGL) $(CAIRO) $(RGBA_PNG_ENABLED) $(FRIBIDI) $(AGG_SVG_SYMBOLS) $(KML) $(GIF) $(CURL)
+          $(OGL) $(CAIRO) $(RGBA_PNG_ENABLED) $(FRIBIDI) $(KML) $(GIF) $(CURL)
 
 !IFDEF WIN64
 MS_CFLAGS=$(INCLUDES) $(MS_DEFS) -DWIN32 -D_WIN32 -DUSE_GENERIC_MS_NINT