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

git-svn-id: http://svn.voria.com/code@274 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 72f3d3f..dd673c2 100644 (file)
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -206,10 +206,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])

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am
index bb159e6..b381460 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am
@@ -10,8 +10,8 @@ if WITH_LIBAVCODEC
 module_LTLIBRARIES = libmod_libavcodec.la
 libmod_libavcodec_la_SOURCES = main.cpp trgt_av.cpp trgt_av.h mptr.cpp mptr.h
 libmod_libavcodec_la_LDFLAGS = -module -no-undefined
-libmod_libavcodec_la_CXXFLAGS = @SYNFIG_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@
-libmod_libavcodec_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
+libmod_libavcodec_la_CXXFLAGS = @SYNFIG_CFLAGS@ @LIBAVCODEC_CFLAGS@
+libmod_libavcodec_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ @LIBAVCODEC_LIBS@
 else
 endif
 EXTRA_DIST= mod_libavcodec.nsh unmod_libavcodec.nsh