X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=a6bb3c4de2eb790189fd68531234f49afd50ccd6;hb=73619743c8650dc9a39c0565628f770e070853d2;hp=992dfc58d22edbc1a0933f2be9922a1e0a52a504;hpb=cede2ebda9fac39714e914268f6ecab52bb46b5f;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 992dfc5..a6bb3c4 100644
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -246,6 +246,30 @@ if test $with_libavcodec = "yes" ; then {
 } ; fi
 
 
+if test $with_libavcodec = "yes" ; then {
+	AC_ARG_WITH(libswscale,
+		[AS_HELP_STRING([--without-libswscale],
+			[disable support for libswscale (Default=auto)])],
+		[],
+		[with_libswscale="yes"]
+	)
+
+	if test $with_libswscale != "no" ; then {
+		PKG_CHECK_MODULES(LIBSWSCALE, [libswscale], [], [echo no; with_libswscale="no"])
+	} ; fi
+
+	if test $with_libswscale = "yes" ; then {
+		AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support])
+    	} else {
+		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
+} ; fi
+AM_CONDITIONAL(WITH_LIBSWSCALE, test "x$with_libswscale" = "xyes")
+
 
 # FREETYPE2 CHECK--------------------
 
@@ -306,8 +330,6 @@ AC_ARG_WITH(openexr,[
 ])
 if test $with_openexr = "yes" ; then {
 	PKG_CHECK_MODULES(OPENEXR, OpenEXR,[
-		CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
-	
 		AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ] )
 		AM_CONDITIONAL(WITH_OPENEXR,true)
 	],
@@ -321,6 +343,7 @@ if test $with_openexr = "no" ; then {
 } ; fi
 if test $use_openexr_half = yes ; then {
 	AC_MSG_RESULT([ ** Using OpenEXR Half.])
+	CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
 	CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
 	OPENEXR_HALF_LIBS="-lHalf"
 } else {
@@ -404,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)
@@ -621,9 +644,9 @@ examples/walk/Makefile
 examples/Makefile
 win32inst.nsi
 pkg-info/macosx/synfig-core.info
-dnl src/modules/trgt_mpg/Makefile
-dnl src/modules/mptr_mplayer/Makefile
 ])
+## src/modules/trgt_mpg/Makefile
+## src/modules/mptr_mplayer/Makefile
 AC_OUTPUT
 
 # -- S U M M A R Y --------------------------------------------
@@ -648,6 +671,7 @@ ETL_CFLAGS -----------------------> $ETL_CFLAGS
 FreeType2 ------------------------> $with_freetype
 fontconfig -----------------------> $with_fontconfig
 libavcodec -----------------------> $with_libavcodec
+libswscale -----------------------> $with_libswscale
 vImage ---------------------------> $with_vimage
 ImageMagick ----------------------> $with_imagemagick
 Magick++ -------------------------> $with_magickpp