X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=b272a87466d709780f7853c25893c4c8711b843c;hb=7228dba2c5731761c045b8e846e9206c01a340f3;hp=72f3d3f96e90345dd1d95c89b7a9dd9dc973a217;hpb=1982b4c4b9bfc28485157161e9b0c566153106f4;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 72f3d3f..b272a87 100644
--- 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])
@@ -295,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
 
 
@@ -502,6 +502,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@