Fix building mod_libavcodec with recent libavcodec/libavformat and remove ancient...

[synfig.git] / synfig-core / trunk / config / configure.ac

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index b10a1d3..dae5009 100644 (file)
--- 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,[