fix marker behavior for moveto-only paths

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6c55b89e7d08a47ce783072f6b7482bb966c34ab..46f255abbcd22c5ab7472963bdb0ec9f30442e33 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([linker tolerates -z relro])
   ink_svd_LDFLAGS="$LDFLAGS"
   LDFLAGS="-Wl,-z,relro $LDFLAGS"
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_LINK_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     LDFLAGS="$ink_svd_LDFLAGS"
@@ -257,19 +257,20 @@ esac
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 
-AC_MSG_CHECKING([for Solaris 2.8 platform])
+AC_MSG_CHECKING([for Solaris platform])
 case "$host" in
-  *-solaris2.8)
-    platform_solaris_2_8=yes
-    CFLAGS="$CFLAGS -DSOLARIS_2_8"
-    CXXFLAGS="$CXXFLAGS -DSOLARIS_2_8"
+  *-solaris2.*)
+    platform_solaris=yes
+    solaris_version=`echo $host|sed -e 's/^.*-solaris2\.//' -e s'/\..*$//'`
+    CFLAGS="$CFLAGS -DSOLARIS=$solaris_version"
+    CXXFLAGS="$CXXFLAGS -DSOLARIS=$solaris_version"
     ;;
   *)
-    platform_solaris_2_8=no
+    platform_solaris=no
     ;;
 esac
-AC_MSG_RESULT([$platform_solaris_2_8])
-AM_CONDITIONAL(PLATFORM_SOLARIS_2_8, test "$platform_solaris_2_8" = "yes")
+AC_MSG_RESULT([$platform_solaris])
+AM_CONDITIONAL(PLATFORM_SOLARIS, test "$platform_solaris" = "yes")
 
 dnl ******************************
 dnl Xft checking
@@ -550,6 +551,12 @@ fi
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
+ink_svd_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$POPPLER_CFLAGS $CPPFLAGS"
+AC_MSG_CHECKING([whether libpoppler has new getNextChar])
+AC_EGREP_CPP([Unicode ..u. int .uLen], [#include "GfxFont.h"], AC_DEFINE([POPPLER_NEW_GFXFONT], [], [True iff libpoppler is 0.8.3 or newer.]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+CPPFLAGS="$ink_svd_CPPFLAGS"
+
 dnl ******************************
 dnl Inkboard dependency checking
 dnl ******************************
@@ -601,19 +608,24 @@ dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************
 
-AC_CHECK_LIB(Magick++, InitializeMagick, [AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)], magick_ok=no, -llcms -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lz -lpthread -lm -lpthread)
-
+PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
 if test "x$magick_ok" = "xyes"; then
-       AC_CHECK_PROG(MAGICKPP_CONFIG, Magick++-config, yes, no)
-       if test "x$MAGICKPP_CONFIG" = "xyes"; then
-               IMAGEMAGICK_LIBS=`Magick++-config --libs`
-               AC_SUBST(IMAGEMAGICK_LIBS)
-               AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
-       fi
+      AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
 fi
-
 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 ******************************
@@ -624,7 +636,7 @@ if test $cc_vers_major -gt 3; then
 else
   min_sigc_version=2.0.11
 fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
 
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
@@ -956,6 +968,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