Combine the check for libavcodec and libavformat into a single search. Only if they...

[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..dd673c2 100644 (file)
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -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,[
@@ -570,22 +570,21 @@ 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
 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'
 "