X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=8c5d1f8b6c808a7e3b20c893b2660fa9a6074e46;hb=2c8c346e2c74a3a65c3c5476fb694230e3484c11;hp=cf70761f3f77f718505d16ae8a4849d5ebbc80e5;hpb=c9d9403918827663b35eb1f41fc2b49a87ec193c;p=synfig.git diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index cf70761..8c5d1f8 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -305,8 +305,8 @@ if test $use_openexr_half = yes ; then { AC_LIB_LTDL -PKG_CHECK_MODULES(ETL, ETL,,[ - AC_MSG_ERROR([ ** You need to install the ETL.]) +PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[ + AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 or greater).]) ]) CONFIG_DEPS="$CONFIG_DEPS ETL" @@ -337,7 +337,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 +371,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 +532,6 @@ AC_SUBST(synfigincludedir) )] -# src/modules/mod_mng/Makefile - AC_OUTPUT( synfig-config @PACKAGE_TARNAME@.pc @@ -541,24 +539,25 @@ 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_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