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

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 79ea10b..7ab5740 100644
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -247,6 +247,17 @@ if test $with_libavcodec = "yes" ; then {
 
 
 if test $with_libavcodec = "yes" ; then {
+
+	# Need to check both the new and old locations for the avformat header
+	# Need to save flags, add avformat flags, check headers and restore flags
+	ac_save_CPPFLAGS="$CPPFLAGS"
+	ac_save_CFLAGS="$CFLAGS"
+	CPPFLAGS="${CPPFLAGS} ${LIBAVCODEC_CFLAGS}"
+	CFLAGS="${CFLAGS} ${LIBAVCODEC_CFLAGS}"
+	AC_CHECK_HEADERS(libavformat/avformat.h avformat.h ffmpeg/avformat.h)
+	CPPFLAGS="${ac_save_CPPFLAGS}"
+	CFLAGS="${ac_save_CFLAGS}"
+
 	AC_ARG_WITH(libswscale,
 		[AS_HELP_STRING([--without-libswscale],
 			[disable support for libswscale (Default=auto)])],
@@ -255,23 +266,30 @@ 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])
+
+		# Need to check both the new and old locations for the swscale header
+		# Need to save flags, add swscale flags, check headers and restore flags
+		ac_save_CPPFLAGS="$CPPFLAGS"
+		ac_save_CFLAGS="$CFLAGS"
+		CPPFLAGS="${CPPFLAGS} ${LIBSWSCALE_CFLAGS}"
+		CFLAGS="${CFLAGS} ${LIBSWSCALE_CFLAGS}"
+		AC_CHECK_HEADERS(libswscale/swscale.h swscale.h ffmpeg/swscale.h)
+		CPPFLAGS="${ac_save_CPPFLAGS}"
+		CFLAGS="${ac_save_CFLAGS}"
     	} 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--------------------
@@ -354,6 +372,19 @@ if test $use_openexr_half = yes ; then {
 } ; fi
 
 
+# JPEG CHECK (commandline switch) ------------------------
+AC_ARG_WITH(jpeg,[
+  --without-jpeg        Disable support for JPEG],[
+],[
+	with_jpeg="yes"
+])
+if test $with_jpeg = "no" ; then {
+	AM_CONDITIONAL(WITH_JPEG,false)
+} else {
+	AM_CONDITIONAL(WITH_JPEG,true)
+} ; fi
+
+
 
 
 
@@ -399,7 +430,6 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"])
 
 TARGET_PNG="yes"
 TARGET_MNG="yes"
-TARGET_JPEG="yes"
 
 AC_CHECK_LIB(png, png_write_row,[
 	PNG_LIBS="-lpng"
@@ -430,23 +460,26 @@ AC_CHECK_LIB(mng, mng_initialize,[
 	AM_CONDITIONAL(HAVE_LIBMNG,false)
 ],[-lz -L${exec_prefix}/lib])
 
-AC_CHECK_LIB(jpeg, main,[
-	JPEG_LIBS="-ljpeg"
-	AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] )
-	AC_SUBST(JPEG_LIBS)
-	AM_CONDITIONAL(HAVE_LIBJPEG,true)
-],[
+# check for JPEG availability
+if test $with_jpeg = "yes" ; then {
+	AC_CHECK_LIB(jpeg, jpeg_CreateCompress,[
+		JPEG_LIBS="-ljpeg"
+		AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] )
+		AC_SUBST(JPEG_LIBS)
+		TARGET_JPEG="yes"
+		AM_CONDITIONAL(HAVE_LIBJPEG,true)
+	],[
+		AC_MSG_RESULT([ *** JPEG Output target disabled])
+		TARGET_JPEG="no"
+		AM_CONDITIONAL(HAVE_LIBJPEG,false)
+	],[
+		-L${exec_prefix}/lib
+	])
+} else {
 	AC_MSG_RESULT([ *** JPEG Output target disabled])
 	TARGET_JPEG="no"
 	AM_CONDITIONAL(HAVE_LIBJPEG,false)
-],[-L${exec_prefix}/lib])
-
-
-dnl AC_CHECK_HEADERS(jpeglib.h,[],[
-dnl 	AC_MSG_RESULT([ *** JPEG Output target disabled])
-dnl 	TARGET_JPEG="no"
-dnl 	AM_CONDITIONAL(HAVE_LIBJPEG,false)
-dnl ])
+} ; fi