X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=dae5009f271aaabe09ec904209dafedf98f26454;hb=a9a9970c7303c616abb61b56754746cd86167fd3;hp=b10a1d37d26b9a2cb1e1d8241f9133765860aed5;hpb=c330cbb315df4b609c494e324b9b248a4e5f3598;p=synfig.git diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index b10a1d3..dae5009 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -197,26 +197,29 @@ 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,[with_libavcodec="yes"],[with_libavcodec="no"]) +} ; fi +if test $with_libavcodec != "no" ; then { + PKG_CHECK_MODULES(LIBAVFORMAT, libavformat,[with_libavcodec="yes"],[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,[