From 21c93dde70f54996d8bd0f7feb7b331d2d893511 Mon Sep 17 00:00:00 2001 From: darco Date: Tue, 10 Jan 2006 21:05:13 +0000 Subject: [PATCH] more updates git-svn-id: http://svn.voria.com/code@102 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/config/build.cfg | 2 +- synfig-core/trunk/config/configure.ac | 3 ++- synfig-core/trunk/examples/Makefile.in | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/synfig-core/trunk/config/build.cfg b/synfig-core/trunk/config/build.cfg index 7425218..70ff3cd 100644 --- a/synfig-core/trunk/config/build.cfg +++ b/synfig-core/trunk/config/build.cfg @@ -4,7 +4,7 @@ PACKAGE_BUGREPORT="darco@voria.com" PACKAGE_TARNAME=synfig VERSION_MAJ="0" VERSION_MIN="61" -VERSION_REV="03" +VERSION_REV="04" [ -d ".svn" ] && VERSION_REL=`svn info | grep Revision | sed "s/.* \([0123456789]*\)/\1/"` SVN_REPOSITORY="https://svn.voria.com/code/synfig-core" diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index cc4efcf..28007f1 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -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=$imagemagic_convert ]) if test $with_imagemagick = "no" ; then { AM_CONDITIONAL(WITH_IMAGEMAGICK,false) diff --git a/synfig-core/trunk/examples/Makefile.in b/synfig-core/trunk/examples/Makefile.in index f0ae222..edcd3cf 100644 --- a/synfig-core/trunk/examples/Makefile.in +++ b/synfig-core/trunk/examples/Makefile.in @@ -193,6 +193,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +imagemagick_convert = @imagemagick_convert@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -- 2.7.4