X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=ebe545ba380a84ec2214e4c07ac0c926ac75be85;hb=003ec710291bf258b8ce357edc15804347f71cb8;hp=a6bb3c4de2eb790189fd68531234f49afd50ccd6;hpb=8cb672e948624db0c4a2a38dd947c8e82f3e8492;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index a6bb3c4..ebe545b 100644
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -2,7 +2,7 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Core],[0.61.08],[http://synfig.org/Bugs],[synfig])
+AC_INIT([Synfig Core],[0.61.09],[http://synfig.org/Bugs],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
@@ -27,7 +27,7 @@ AC_DEFINE(LT_SCOPE,[extern],[LibLTDL is linked staticly])
 
 # -- V A R I A B L E S ----------------------------------------
 
-SVN_REPOSITORY=http://svn.voria.com/code/synfig-core
+SVN_REPOSITORY=https://synfig.svn.sourceforge.net/svnroot/synfig/synfig-core
 AC_SUBST(SVN_REPOSITORY)
 
 # -- P R O G R A M S ------------------------------------------
@@ -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)])],
@@ -260,6 +271,16 @@ if test $with_libavcodec = "yes" ; then {
 
 	if test $with_libswscale = "yes" ; then {
 		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 {
 		AC_CHECK_LIB(avcodec, img_convert,
 			[AC_MSG_RESULT([ *** Using deprecated function img_convert.])],
@@ -351,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
+
+
 
 
 
@@ -364,8 +398,8 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.14.4])
 localedir="$datadir/locale"
 
-PKG_CHECK_MODULES(ETL, [ETL >= 0.04.11],,[
-	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.11 or greater).])
+PKG_CHECK_MODULES(ETL, [ETL >= 0.04.12],,[
+	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.12 or greater).])
 ])
 CONFIG_DEPS="$CONFIG_DEPS ETL"
 
@@ -396,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"
@@ -427,23 +460,26 @@ AC_CHECK_LIB(mng, mng_initialize,[
 	AM_CONDITIONAL(HAVE_LIBMNG,false)
 ],[-lz -L${exec_prefix}/lib])
 
-AC_CHECK_LIB(jpeg, jpeg_CreateCompress,[
-	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
 
 
 
@@ -583,6 +619,7 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
+# this line is required for libtool 1.5.26 but must not be present for libtool 2.2.4...
 AC_CONFIG_SUBDIRS(libltdl)
 
 CONFIG_LIBS="-lsynfig"