X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=fe32d010e7f4bebfcc06cff29e9a603450f990ba;hb=93ae1a8db0116cd93b6e1c844207b2a12cda73fa;hp=dae5009f271aaabe09ec904209dafedf98f26454;hpb=a9a9970c7303c616abb61b56754746cd86167fd3;p=synfig.git diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index dae5009..fe32d01 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -1,4 +1,4 @@ -i# $Header: /opt/voria/cvs/synfig/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $ +# $Id$ # -- I N I T -------------------------------------------------- @@ -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],[ ],[ @@ -206,10 +237,7 @@ AC_ARG_WITH(libavcodec,[ ]) if test $with_libavcodec != "no" ; then { - PKG_CHECK_MODULES(LIBAVCODEC, libavcodec,[with_libavcodec="yes"],[with_libavcodec="no"]) -} ; fi -if test $with_libavcodec != "no" ; then { - PKG_CHECK_MODULES(LIBAVFORMAT, libavformat,[with_libavcodec="yes"],[with_libavcodec="no"]) + PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec libavformat],[],[echo no; with_libavcodec="no"]) } ; fi if test $with_libavcodec = "yes" ; then { AC_DEFINE(WITH_LIBAVCODEC,[],[enable libavcodec support]) @@ -295,6 +323,9 @@ if test $with_openexr = "no" ; then { if test $use_openexr_half = yes ; then { AC_MSG_RESULT([ ** Using OpenEXR Half.]) CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE" + OPENEXR_HALF_LIBS="-lHalf" +} else { + OPENEXR_HALF_LIBS="" } ; fi @@ -305,8 +336,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,6 +368,7 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"]) TARGET_TIF="yes" TARGET_PNG="yes" +TARGET_MNG="yes" TARGET_JPEG="yes" if test "$TARGET_TIF" != "disabled" ; then @@ -370,6 +402,17 @@ 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(jpeg, main,[ JPEG_LIBS="-ljpeg" AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] ) @@ -502,6 +545,8 @@ AC_SUBST(LIBADD_DL) AC_SUBST(SYNFIG_LIBS) AC_SUBST(SYNFIG_CFLAGS) +AC_SUBST(OPENEXR_HALF_LIBS) + AC_SUBST(API_VERSION) synfigincludedir=$includedir/synfig-@API_VERSION@ @@ -525,26 +570,29 @@ 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 examples/Makefile win32inst.nsi pkg-info/macosx/synfig-core.info @@ -569,26 +617,27 @@ GProf Profiling ------------------> $profiling Debug Mode -----------------------> $debug ($debug_flags) Optimization ---------------------> $optimization PNG output target support --------> $TARGET_PNG +MNG output target support --------> $TARGET_MNG TIFF output target support -------> $TARGET_TIF JPEG output target support -------> $TARGET_JPEG ETL_CFLAGS -----------------------> $ETL_CFLAGS FreeType2 ------------------------> $with_freetype -fontconfig ------------------------> $with_fontconfig +fontconfig -----------------------> $with_fontconfig libavcodec -----------------------> $with_libavcodec vImage ---------------------------> $with_vimage -GLib -----------------------------> $GLIB ImageMagick ----------------------> $with_imagemagick +Magick++ -------------------------> $with_magickpp FFMPEG ---------------------------> $with_ffmpeg libdv ----------------------------> $with_libdv OpenEXR --------------------------> $with_openexr Using OpenEXR's \"half\" type ------> $use_openexr_half -"'$'"CXX ------------------------------> '$CXX' -"'$'"CXXFLAGS -------------------------> '$CXXFLAGS' -"'$'"SYNFIG_LIBS -----------------------> '$SYNFIG_LIBS' -"'$'"LIBXMLPP_LIBS --------------------> '$LIBXMLPP_LIBS' -"'$'"ETL_LIBS -------------------------> '$ETL_LIBS' -"'$'"LIBSIGC_LIBS ---------------------> '$LIBSIGC_LIBS' -"'$'"SYNFIG_CFLAGS ---------------------> '$SYNFIG_CFLAGS' -"'$'"LIBADD_DL ------------------------> '$LIBADD_DL' +"'$'"CXX -----------------------------> '$CXX' +"'$'"CXXFLAGS ------------------------> '$CXXFLAGS' +"'$'"SYNFIG_LIBS ---------------------> '$SYNFIG_LIBS' +"'$'"LIBXMLPP_LIBS -------------------> '$LIBXMLPP_LIBS' +"'$'"ETL_LIBS ------------------------> '$ETL_LIBS' +"'$'"LIBSIGC_LIBS --------------------> '$LIBSIGC_LIBS' +"'$'"SYNFIG_CFLAGS -------------------> '$SYNFIG_CFLAGS' +"'$'"LIBADD_DL -----------------------> '$LIBADD_DL' "