summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-06-18 02:14:06 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-06-18 02:14:06 +0000
commitdac8076aecf2fe010551c3687ad37d28df20065f (patch)
tree373983574dfb262a38458471d6c300d8f62af823 /configure.ac
parentNew LPE: Copy rotate (diff)
downloadinkscape-dac8076aecf2fe010551c3687ad37d28df20065f.tar.gz
inkscape-dac8076aecf2fe010551c3687ad37d28df20065f.zip
Add handle to adjust angle
(bzr r5979)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 852970ba8..c3b998075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -610,15 +610,6 @@ 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 ******************************
@@ -803,6 +794,10 @@ 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)
@@ -961,7 +956,6 @@ 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