Fix the libjpeg configure test to look for the right function.

[synfig.git] / synfig-core / trunk / configure.ac

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 2e7e7b0..0d2c62e 100644 (file)
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -246,6 +246,33 @@ 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 {
+               AC_CHECK_LIB(swscale, sws_getContext, [], [echo no; with_libswscale="no"], [])
+       } ; fi
+
+       if test $with_libswscale = "yes" ; then {
+               LIBAVCODEC_LIBS="$LIBAVCODEC_LIBS -lswscale"
+               AM_CONDITIONAL(HAVE_LIBSWSCALE, true)
+       } 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
+
 
 # FREETYPE2 CHECK--------------------
 
@@ -403,7 +430,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)
@@ -647,6 +674,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