- added option to build included libagg as static library
This commit is contained in:
Andreas Volz
parent
c8e4029971
commit
49e6d1d7bf
7 changed files with 211 additions and 9 deletions
|
|
@ -2,17 +2,17 @@
|
|||
## Created by Anjuta
|
||||
|
||||
SUBDIRS = src \
|
||||
agg\
|
||||
plugins\
|
||||
include
|
||||
|
||||
|
||||
mapnikdocdir = ${prefix}/doc/mapnik
|
||||
mapnikdoc_DATA = \
|
||||
README\
|
||||
COPYING\
|
||||
AUTHORS\
|
||||
ChangeLog\
|
||||
INSTALL\
|
||||
NEWS
|
||||
INSTALL
|
||||
|
||||
EXTRA_DIST = $(mapnikdoc_DATA) \
|
||||
$(fonts_DATA)\
|
||||
|
|
|
|||
7
agg/Makefile.am
Normal file
7
agg/Makefile.am
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
|
||||
SUBDIRS = \
|
||||
src\
|
||||
include
|
||||
|
||||
## File created by the gnome-build tools
|
||||
|
||||
137
agg/include/Makefile.am
Normal file
137
agg/include/Makefile.am
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
|
||||
if BUILD_AGG
|
||||
|
||||
libaggdir = $(pkgincludedir)/agg
|
||||
|
||||
libagg_HEADERS = \
|
||||
agg_alpha_mask_u8.h\
|
||||
agg_arc.h \
|
||||
agg_array.h \
|
||||
agg_arrowhead.h \
|
||||
agg_basics.h \
|
||||
agg_bezier_arc.h \
|
||||
agg_bitset_iterator.h \
|
||||
agg_blur.h \
|
||||
agg_bounding_rect.h \
|
||||
agg_bspline.h \
|
||||
agg_clip_liang_barsky.h \
|
||||
agg_color_gray.h \
|
||||
agg_color_rgba.h \
|
||||
agg_config.h \
|
||||
agg_conv_adaptor_vcgen.h \
|
||||
agg_conv_adaptor_vpgen.h \
|
||||
agg_conv_bspline.h \
|
||||
agg_conv_clip_polygon.h \
|
||||
agg_conv_clip_polyline.h \
|
||||
agg_conv_close_polygon.h \
|
||||
agg_conv_concat.h \
|
||||
agg_conv_contour.h \
|
||||
agg_conv_curve.h \
|
||||
agg_conv_dash.h \
|
||||
agg_conv_gpc.h \
|
||||
agg_conv_marker.h \
|
||||
agg_conv_marker_adaptor.h \
|
||||
agg_conv_segmentator.h \
|
||||
agg_conv_shorten_path.h \
|
||||
agg_conv_smooth_poly1.h \
|
||||
agg_conv_stroke.h \
|
||||
agg_conv_transform.h \
|
||||
agg_conv_unclose_polygon.h \
|
||||
agg_curves.h \
|
||||
agg_dda_line.h \
|
||||
agg_ellipse.h \
|
||||
agg_ellipse_bresenham.h \
|
||||
agg_embedded_raster_fonts.h \
|
||||
agg_font_cache_manager.h \
|
||||
agg_gamma_functions.h \
|
||||
agg_gamma_lut.h \
|
||||
agg_glyph_raster_bin.h \
|
||||
agg_gradient_lut.h \
|
||||
agg_gsv_text.h \
|
||||
agg_image_accessors.h \
|
||||
agg_image_filters.h \
|
||||
agg_line_aa_basics.h \
|
||||
agg_math.h \
|
||||
agg_math_stroke.h \
|
||||
agg_path_length.h \
|
||||
agg_path_storage.h \
|
||||
agg_path_storage_integer.h \
|
||||
agg_pattern_filters_rgba.h \
|
||||
agg_pixfmt_amask_adaptor.h \
|
||||
agg_pixfmt_gray.h \
|
||||
agg_pixfmt_rgb.h \
|
||||
agg_pixfmt_rgba.h \
|
||||
agg_pixfmt_rgb_packed.h \
|
||||
agg_pixfmt_transposer.h \
|
||||
agg_rasterizer_cells_aa.h \
|
||||
agg_rasterizer_compound_aa.h \
|
||||
agg_rasterizer_outline.h \
|
||||
agg_rasterizer_outline_aa.h \
|
||||
agg_rasterizer_scanline_aa.h \
|
||||
agg_rasterizer_sl_clip.h \
|
||||
agg_renderer_base.h \
|
||||
agg_renderer_markers.h \
|
||||
agg_renderer_mclip.h \
|
||||
agg_renderer_outline_aa.h \
|
||||
agg_renderer_outline_image.h \
|
||||
agg_renderer_primitives.h \
|
||||
agg_renderer_raster_text.h \
|
||||
agg_renderer_scanline.h \
|
||||
agg_rendering_buffer.h \
|
||||
agg_rendering_buffer_dynarow.h \
|
||||
agg_rounded_rect.h \
|
||||
agg_scanline_bin.h \
|
||||
agg_scanline_boolean_algebra.h \
|
||||
agg_scanline_p.h \
|
||||
agg_scanline_storage_aa.h \
|
||||
agg_scanline_storage_bin.h \
|
||||
agg_scanline_u.h \
|
||||
agg_shorten_path.h \
|
||||
agg_simul_eq.h \
|
||||
agg_span_allocator.h \
|
||||
agg_span_converter.h \
|
||||
agg_span_gouraud.h \
|
||||
agg_span_gouraud_gray.h \
|
||||
agg_span_gouraud_rgba.h \
|
||||
agg_span_gradient.h \
|
||||
agg_span_gradient_alpha.h \
|
||||
agg_span_image_filter.h \
|
||||
agg_span_image_filter_gray.h \
|
||||
agg_span_image_filter_rgb.h \
|
||||
agg_span_image_filter_rgba.h \
|
||||
agg_span_interpolator_adaptor.h \
|
||||
agg_span_interpolator_linear.h \
|
||||
agg_span_interpolator_persp.h \
|
||||
agg_span_interpolator_trans.h \
|
||||
agg_span_pattern_gray.h \
|
||||
agg_span_pattern_rgb.h \
|
||||
agg_span_pattern_rgba.h \
|
||||
agg_span_solid.h \
|
||||
agg_span_subdiv_adaptor.h \
|
||||
agg_trans_affine.h \
|
||||
agg_trans_bilinear.h \
|
||||
agg_trans_double_path.h \
|
||||
agg_trans_lens.h \
|
||||
agg_trans_perspective.h \
|
||||
agg_trans_single_path.h \
|
||||
agg_trans_viewport.h \
|
||||
agg_trans_warp_magnifier.h \
|
||||
agg_vcgen_bspline.h \
|
||||
agg_vcgen_contour.h \
|
||||
agg_vcgen_dash.h \
|
||||
agg_vcgen_markers_term.h \
|
||||
agg_vcgen_smooth_poly1.h \
|
||||
agg_vcgen_stroke.h \
|
||||
agg_vcgen_vertex_sequence.h \
|
||||
agg_vertex_sequence.h \
|
||||
agg_vpgen_clip_polygon.h \
|
||||
agg_vpgen_clip_polyline.h \
|
||||
agg_vpgen_segmentator.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(libagg_HEADERS)
|
||||
|
||||
endif
|
||||
|
||||
## File created by the gnome-build tools
|
||||
|
||||
40
agg/src/Makefile.am
Normal file
40
agg/src/Makefile.am
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
|
||||
if BUILD_AGG
|
||||
|
||||
noinst_LTLIBRARIES = \
|
||||
libagg.la
|
||||
|
||||
libagg_la_SOURCES = \
|
||||
agg_arc.cpp\
|
||||
agg_arrowhead.cpp\
|
||||
agg_bezier_arc.cpp \
|
||||
agg_bspline.cpp \
|
||||
agg_curves.cpp \
|
||||
agg_embedded_raster_fonts.cpp \
|
||||
agg_gsv_text.cpp \
|
||||
agg_image_filters.cpp \
|
||||
agg_line_aa_basics.cpp \
|
||||
agg_line_profile_aa.cpp \
|
||||
agg_rounded_rect.cpp \
|
||||
agg_sqrt_tables.cpp \
|
||||
agg_trans_affine.cpp \
|
||||
agg_trans_double_path.cpp \
|
||||
agg_trans_single_path.cpp \
|
||||
agg_trans_warp_magnifier.cpp \
|
||||
agg_vcgen_bspline.cpp \
|
||||
agg_vcgen_contour.cpp \
|
||||
agg_vcgen_dash.cpp \
|
||||
agg_vcgen_markers_term.cpp \
|
||||
agg_vcgen_smooth_poly1.cpp \
|
||||
agg_vcgen_stroke.cpp \
|
||||
agg_vpgen_clip_polygon.cpp \
|
||||
agg_vpgen_clip_polyline.cpp \
|
||||
agg_vpgen_segmentator.cpp
|
||||
|
||||
libagg_la_CXXFLAGS = \
|
||||
-I../include
|
||||
|
||||
endif
|
||||
|
||||
## File created by the gnome-build tools
|
||||
|
||||
22
configure.ac
22
configure.ac
|
|
@ -84,9 +84,24 @@ PKG_CHECK_MODULES(FREETYPE2, freetype2)
|
|||
AC_SUBST(FREETYPE2_CFLAGS)
|
||||
AC_SUBST(FREETYPE2_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(AGG, libagg)
|
||||
AC_SUBST(AGG_CFLAGS)
|
||||
dnl Check for option to enable included-agg
|
||||
AC_MSG_CHECKING(whether to enable included libagg building)
|
||||
AC_ARG_ENABLE(included_agg,
|
||||
[ --enable-included-agg=[no/yes] enables included libagg build (default=yes)],,
|
||||
enable_included_agg=yes)
|
||||
|
||||
if [ test "x$enable_included_agg" = "xyes"]; then
|
||||
AM_CONDITIONAL(BUILD_AGG, test "x$enable_included_agg" = "xyes")
|
||||
AGG_LIBS=-L../agg/src
|
||||
AGG_CFLAGS=-I../agg/include
|
||||
AC_SUBST(AGG_LIBS)
|
||||
AC_SUBST(AGG_CFLAGS)
|
||||
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
PKG_CHECK_MODULES(AGG, libagg)
|
||||
fi
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
|
|
@ -101,4 +116,7 @@ plugins/input/shape/Makefile
|
|||
src/Makefile
|
||||
mapnik.pc
|
||||
mapnik-uninstalled.pc
|
||||
agg/Makefile
|
||||
agg/src/Makefile
|
||||
agg/include/Makefile
|
||||
])
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ Description: Free Toolkit for developing mapping applications, Not Installed
|
|||
Version: @VERSION@
|
||||
Requires:
|
||||
Conflicts:
|
||||
Libs: ${pcfiledir}/${libdir}/libmapnik.la
|
||||
Cflags: -I${pcfiledir}/${includedir}
|
||||
Libs: ${pcfiledir}/${libdir}/libmapnik.la ${pcfiledir}/agg/${libdir}/libagg.la
|
||||
Cflags: -I${pcfiledir}/${includedir} -I${pcfiledir}/agg/${includedir}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ Version: @VERSION@
|
|||
Requires:
|
||||
Conflicts:
|
||||
Libs: -L${libdir} -lmapnik
|
||||
Cflags: -I${includedir}
|
||||
Cflags: -I${includedir} -I${includedir}/agg
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue