X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=a6bb3c4de2eb790189fd68531234f49afd50ccd6;hb=78aeb61398c711707f2f2e9131137df316221caf;hp=79ea10bbef13a00408a698766fdacbdfde03c193;hpb=a46bd51d2a00f57d4e5335b77181d93e6b796ee9;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 79ea10b..a6bb3c4 100644
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -255,23 +255,20 @@ if test $with_libavcodec = "yes" ; then {
 	)
 
 	if test $with_libswscale != "no" ; then {
-		AC_CHECK_LIB(swscale, sws_getContext, [], [echo no; with_libswscale="no"], [])
+		PKG_CHECK_MODULES(LIBSWSCALE, [libswscale], [], [echo no; with_libswscale="no"])
 	} ; fi
 
 	if test $with_libswscale = "yes" ; then {
-		LIBAVCODEC_LIBS="$LIBAVCODEC_LIBS -lswscale"
-		AM_CONDITIONAL(HAVE_LIBSWSCALE, true)
+		AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support])
     	} else {
-		AM_CONDITIONAL(HAVE_LIBSWSCALE, false)
 		AC_CHECK_LIB(avcodec, img_convert,
 			[AC_MSG_RESULT([ *** Using deprecated function img_convert.])],
 			[AC_MSG_FAILURE([Neither libswscale nor function img_convert was found.])],
 			[]
 		)
 	} ; fi
-} else {
-	AM_CONDITIONAL(HAVE_LIBSWSCALE, false)
 } ; fi
+AM_CONDITIONAL(WITH_LIBSWSCALE, test "x$with_libswscale" = "xyes")
 
 
 # FREETYPE2 CHECK--------------------
@@ -430,7 +427,7 @@ AC_CHECK_LIB(mng, mng_initialize,[
 	AM_CONDITIONAL(HAVE_LIBMNG,false)
 ],[-lz -L${exec_prefix}/lib])
 
-AC_CHECK_LIB(jpeg, main,[
+AC_CHECK_LIB(jpeg, jpeg_CreateCompress,[
 	JPEG_LIBS="-ljpeg"
 	AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] )
 	AC_SUBST(JPEG_LIBS)