diff options
| author | Felipe Corr??a da Silva Sanches <juca@members.fsf.org> | 2008-06-20 04:42:28 +0000 |
|---|---|---|
| committer | JucaBlues <JucaBlues@users.sourceforge.net> | 2008-06-20 04:42:28 +0000 |
| commit | 50ceb230541b38abd3feb1f1f022f6fe69034bb3 (patch) | |
| tree | 1e6fc90721ef6fcbdd13ca0d7bef8915aef240be | |
| parent | comment fix (diff) | |
| download | inkscape-50ceb230541b38abd3feb1f1f022f6fe69034bb3.tar.gz inkscape-50ceb230541b38abd3feb1f1f022f6fe69034bb3.zip | |
reverting (possibly mistaken) edits on configure.ac by cilix42 made on
revision 18964
(bzr r6002)
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c3b998075..852970ba8 100644 --- a/configure.ac +++ b/configure.ac @@ -610,6 +610,15 @@ AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes") AC_SUBST(IMAGEMAGICK_LIBS) AC_SUBST(IMAGEMAGICK_CFLAGS) +dnl *********************************************************************************************************** +dnl Check for a Cairo version that implements user-fonts feature, so that we conditionally add SVGFonts support +dnl *********************************************************************************************************** + +PKG_CHECK_MODULES(CAIRO_USER_FONTS, cairo > 1.6.4, cairouserfonts=yes, cairouserfonts=no) +if test "x$cairouserfonts" = "xyes"; then + AC_DEFINE(ENABLE_SVG_FONTS, 1, [SVG Fonts should be used]) +fi + dnl ****************************** dnl Unconditional dependencies dnl ****************************** @@ -794,10 +803,6 @@ if test "$GXX" = "yes"; then # Add even more stuff CXXFLAGS="-Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS" - ## This is evil! - CXXFLAGS="" - CFLAGS="" - dnl Test for arch-specific situations. case "$host_cpu" in mips|mipsel) @@ -956,6 +961,7 @@ share/examples/Makefile share/extensions/Makefile share/extensions/alphabet_soup/Makefile share/extensions/Barcode/Makefile +share/extensions/Poly3DObjects/Makefile share/extensions/xaml2svg/Makefile share/fonts/Makefile share/gradients/Makefile |