X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=09ebcfbc1898d6268d1935678a846d8a6d2057fd;hb=633c08b084b6ab9868e0c0f428903467e536afb9;hp=3dda9b5c6b13620b1d391fe5b15895d2d09ee736;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 3dda9b5..09ebcfb 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/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)
 
@@ -29,6 +29,8 @@ AC_DEFINE(LT_SCOPE,[extern],[LibLTDL is linked staticly])
 
 # -- V A R I A B L E S ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+AC_SUBST(SVN_REPOSITORY)
 
 # -- P R O G R A M S ------------------------------------------
 
@@ -138,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)
@@ -224,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,[