X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsynfig-core%2Fconfig%2Fconfigure.ac;h=09ebcfbc1898d6268d1935678a846d8a6d2057fd;hb=05f7482acd0c0f72848436c23869dc6f88b9f5a8;hp=cc4efcf5ef4626a7f6c4b0a0158413d464022734;hpb=807c340e3d7dd4912cc9a9db1159030bcbf81609;p=synfig.git diff --git a/synfig-core/tags/stable/synfig-core/config/configure.ac b/synfig-core/tags/stable/synfig-core/config/configure.ac index cc4efcf..09ebcfb 100644 --- a/synfig-core/tags/stable/synfig-core/config/configure.ac +++ b/synfig-core/tags/stable/synfig-core/config/configure.ac @@ -15,7 +15,7 @@ dnl AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AM_MAINTAINER_MODE -AC_LIBLTDL_CONVENIENCE +AC_LIBLTDL_INSTALLABLE AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) @@ -140,7 +140,8 @@ if test $use_layerprofiling = "yes" ; then { AC_ARG_WITH(imagemagick,[ --without-imagemagick Disable support for ImageMagick],[ ],[ - with_imagemagick="yes" + AC_CHECK_PROG([imagemagick_convert],[convert],[yes],[no]) + with_imagemagick=$imagemagick_convert ]) if test $with_imagemagick = "no" ; then { AM_CONDITIONAL(WITH_IMAGEMAGICK,false) @@ -226,7 +227,7 @@ AC_ARG_WITH(freetype,[ if test $with_freetype != "no" ; then { - PKG_CHECK_MODULES(FREETYPE, xft fontconfig,[ + PKG_CHECK_MODULES(FREETYPE, xft freetype2 fontconfig,[ with_freetype="yes" ],[ PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[