X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=c18bde2b5531631f24e417e55e6dc563d97b090d;hb=fbe71f14d35b3dca19d6222a76a587bb9ecf5ea1;hp=28007f1cccd1540c97aae2941861b14cc6307525;hpb=21c93dde70f54996d8bd0f7feb7b331d2d893511;p=synfig.git diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index 28007f1..c18bde2 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 -------------------------------------------------- @@ -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) @@ -141,7 +141,7 @@ AC_ARG_WITH(imagemagick,[ --without-imagemagick Disable support for ImageMagick],[ ],[ AC_CHECK_PROG([imagemagick_convert],[convert],[yes],[no]) - with_imagemagick=$imagemagic_convert + with_imagemagick=$imagemagick_convert ]) if test $with_imagemagick = "no" ; then { AM_CONDITIONAL(WITH_IMAGEMAGICK,false) @@ -197,26 +197,26 @@ if test $with_libdv = "no" ; then { +# LIBAVCODEC CHECK-------------------- AC_ARG_WITH(libavcodec,[ - --with-libavcodec Enable support for libavcodec (Default=auto)],[ + --without-libavcodec disable support for libavcodec (Default=auto)],[ ],[ - AC_CHECK_LIB(avcodec, avcodec_find_encoder,[ - with_libavcodec="yes" - ],[ - with_libavcodec="no" - ]) + with_libavcodec="yes" ]) -if test $with_libavcodec = "no" ; then { - AM_CONDITIONAL(WITH_LIBAVCODEC,false) -} else { + +if test $with_libavcodec != "no" ; then { + 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]) AM_CONDITIONAL(WITH_LIBAVCODEC,true) +} else { + AM_CONDITIONAL(WITH_LIBAVCODEC,false) } ; fi - - # FREETYPE2 CHECK-------------------- AC_ARG_WITH(freetype,[ @@ -225,22 +225,16 @@ AC_ARG_WITH(freetype,[ with_freetype="yes" ]) - if test $with_freetype != "no" ; then { - PKG_CHECK_MODULES(FREETYPE, xft fontconfig,[ + PKG_CHECK_MODULES(FREETYPE, freetype2,[ with_freetype="yes" ],[ - PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[ + PKG_CHECK_MODULES(FREETYPE, xft,[ with_freetype="yes" ],[ with_freetype="no" ]) ]) -# AC_CHECK_FT2(,[ -# with_freetype="yes" -# ],[ -# with_freetype="no" -# ]) } ; fi if test $with_freetype = "no" ; then { @@ -250,8 +244,28 @@ if test $with_freetype = "no" ; then { } ; fi +# FONTCONFIG CHECK-------------------- + +AC_ARG_WITH(fontconfig,[ + --without-fontconfig disable support for fontconfig (Default=auto)],[ +],[ + with_fontconfig="yes" +]) +if test $with_fontconfig != "no" ; then { + PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[ + with_fontconfig="yes" + ],[ + with_fontconfig="no" + ]) +} ; fi +if test $with_fontconfig = "yes" ; then { + AC_DEFINE(WITH_FONTCONFIG,[],[enable fontconfig support]) + AM_CONDITIONAL(WITH_FONTCONFIG,true) +} else { + AM_CONDITIONAL(WITH_FONTCONFIG,false) +} ; fi # OPENEXR CHECK------------------------ @@ -278,6 +292,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 @@ -288,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.09],,[ + AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.09 or greater).]) ]) CONFIG_DEPS="$CONFIG_DEPS ETL" @@ -320,6 +337,7 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"]) TARGET_TIF="yes" TARGET_PNG="yes" +TARGET_MNG="no" TARGET_JPEG="yes" if test "$TARGET_TIF" != "disabled" ; then @@ -341,11 +359,29 @@ AC_CHECK_LIB(png, png_write_row,[ AC_SUBST(PNG_LIBS) AM_CONDITIONAL(HAVE_LIBPNG,true) ],[ - AC_MSG_RESULT([ *** PNG Output target disabled]) - TARGET_PNG="no" - AM_CONDITIONAL(HAVE_LIBPNG,false) + AC_CHECK_LIB(png12, png_write_row,[ + PNG_LIBS="-lpng12" + AC_DEFINE(HAVE_LIBPNG,[]) + AC_SUBST(PNG_LIBS) + AM_CONDITIONAL(HAVE_LIBPNG,true) + ],[ + AC_MSG_RESULT([ *** PNG Output target disabled]) + TARGET_PNG="no" + AM_CONDITIONAL(HAVE_LIBPNG,false) + ],[-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 ] ) @@ -478,6 +514,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@ @@ -494,6 +532,8 @@ AC_SUBST(synfigincludedir) )] +# src/modules/mod_mng/Makefile + AC_OUTPUT( synfig-config @PACKAGE_TARNAME@.pc @@ -521,6 +561,7 @@ src/modules/mod_yuv420p/Makefile src/modules/mod_particle/Makefile src/tool/Makefile src/modules/synfig_modules.cfg +examples/walk/Makefile examples/Makefile win32inst.nsi pkg-info/macosx/synfig-core.info @@ -545,25 +586,26 @@ 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 libavcodec -----------------------> $with_libavcodec vImage ---------------------------> $with_vimage -GLib -----------------------------> $GLIB ImageMagick ----------------------> $with_imagemagick 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' "