X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=6e392079b227beec89b5c023c4fe5844efba1ff6;hb=cc5527e2d07e7164bb07776355d7491197e40b6e;hp=951cf29e5484fa09b6b340ce3d3832e232423551;hpb=cef9c8d1550d556f712d82000680956beed5f2af;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 951cf29..6e39207 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -153,6 +153,37 @@ if test $with_imagemagick = "no" ; then {
 
 
 
+AC_ARG_WITH(magickpp,[
+  --without-magickpp        Disable support for Magick++],[
+],[
+	with_magickpp="yes"
+])
+if test $with_magickpp = "yes" ; then {
+  AC_CHECK_HEADER([Magick++.h],[
+  	MAGICKPP_LIBS="-lMagick++"
+  	AC_DEFINE(HAVE_MAGICKPP,[], [ Define if Magick++ library is available ] )
+  	AC_SUBST(MAGICKPP_LIBS)
+  	AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
+	AC_CHECK_LIB(Magick++,OptimizeImageTransparency,[
+		AC_DEFINE(HAVE_MAGICK_OPTIMIZE,[], [ Define if Magick++ defines OptimizeImageTransparency() ] )
+		AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,true)
+	],[
+		AC_MSG_RESULT([ *** OptimizeImageTransparency() not available - need ImageMagick 6.3 or newer ])
+		AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,false)
+	])
+  ],[
+	with_magickpp="no"
+  	AC_MSG_RESULT([ *** Magick++ Output target disabled])
+  	TARGET_MAGICKPP="no"
+  	AM_CONDITIONAL(HAVE_LIBMAGICKPP,false)
+  ])
+} else {
+	AM_CONDITIONAL(HAVE_LIBMAGICKPP,false)
+} ; fi
+
+
+
+
 AC_ARG_WITH(ffmpeg,[
   --without-ffmpeg        Disable support for FFMPEG],[
 ],[
@@ -337,7 +368,7 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"])
 
 TARGET_TIF="yes"
 TARGET_PNG="yes"
-TARGET_MNG="no"
+TARGET_MNG="yes"
 TARGET_JPEG="yes"
 
 if test "$TARGET_TIF" != "disabled" ; then
@@ -371,16 +402,16 @@ AC_CHECK_LIB(png, png_write_row,[
 	],[-lz -L${exec_prefix}/lib])
 ],[-lz -L${exec_prefix}/lib])
 
-#AC_CHECK_LIB(mng, mng_initialize,[
-#	MNG_LIBS="-lmng -lz"
-#	AC_DEFINE(HAVE_LIBMNG,[], [ Define if MNG library is available ] )
-#	AC_SUBST(MNG_LIBS)
-#	AM_CONDITIONAL(HAVE_LIBMNG,true)
-#],[
-#	AC_MSG_RESULT([ *** MNG Output target disabled])
-#	TARGET_MNG="no"
-#	AM_CONDITIONAL(HAVE_LIBMNG,false)
-#],[-lz -L${exec_prefix}/lib])
+AC_CHECK_LIB(mng, mng_initialize,[
+	MNG_LIBS="-lmng -lz"
+	AC_DEFINE(HAVE_LIBMNG,[], [ Define if MNG library is available ] )
+	AC_SUBST(MNG_LIBS)
+	AM_CONDITIONAL(HAVE_LIBMNG,true)
+],[
+	AC_MSG_RESULT([ *** MNG Output target disabled])
+	TARGET_MNG="no"
+	AM_CONDITIONAL(HAVE_LIBMNG,false)
+],[-lz -L${exec_prefix}/lib])
 
 AC_CHECK_LIB(jpeg, main,[
 	JPEG_LIBS="-ljpeg"
@@ -532,8 +563,6 @@ AC_SUBST(synfigincludedir)
 	
 )]
 
-# src/modules/mod_mng/Makefile
-
 AC_OUTPUT(
 synfig-config
 @PACKAGE_TARNAME@.pc
@@ -541,24 +570,26 @@ Makefile
 src/Makefile
 src/synfig/Makefile
 src/modules/Makefile
-src/modules/mod_filter/Makefile
-src/modules/mod_bmp/Makefile
-src/modules/mod_gif/Makefile
-src/modules/mod_ppm/Makefile
-src/modules/mod_png/Makefile
-src/modules/mod_jpeg/Makefile
+src/modules/lyr_freetype/Makefile
 src/modules/lyr_std/Makefile
+src/modules/mod_bmp/Makefile
+src/modules/mod_dv/Makefile
+src/modules/mod_ffmpeg/Makefile
+src/modules/mod_filter/Makefile
 src/modules/mod_geometry/Makefile
+src/modules/mod_gif/Makefile
 src/modules/mod_gradient/Makefile
-src/modules/mod_noise/Makefile
-src/modules/lyr_freetype/Makefile
-src/modules/mod_ffmpeg/Makefile
-src/modules/mod_dv/Makefile
 src/modules/mod_imagemagick/Makefile
-src/modules/mod_openexr/Makefile
+src/modules/mod_jpeg/Makefile
 src/modules/mod_libavcodec/Makefile
-src/modules/mod_yuv420p/Makefile
+src/modules/mod_magickpp/Makefile
+src/modules/mod_mng/Makefile
+src/modules/mod_noise/Makefile
+src/modules/mod_openexr/Makefile
 src/modules/mod_particle/Makefile
+src/modules/mod_png/Makefile
+src/modules/mod_ppm/Makefile
+src/modules/mod_yuv420p/Makefile
 src/tool/Makefile
 src/modules/synfig_modules.cfg
 examples/walk/Makefile
@@ -595,6 +626,7 @@ fontconfig -----------------------> $with_fontconfig
 libavcodec -----------------------> $with_libavcodec
 vImage ---------------------------> $with_vimage
 ImageMagick ----------------------> $with_imagemagick
+Magick++ -------------------------> $with_magickpp
 FFMPEG ---------------------------> $with_ffmpeg
 libdv ----------------------------> $with_libdv
 OpenEXR --------------------------> $with_openexr