X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=5f1ac5335314e9795dc0f02d7e0d5b46e6ebeb19;hb=237c52eb72d99427b00119007274aaef8c720121;hp=45c00c0a24d036c3fe7cc15c8e2eba0a4cc7336e;hpb=e5a5ede2bc37353016f6c3530234f827eccf538e;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 45c00c0..5f1ac53 100644
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -2,11 +2,11 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Core],[0.61.07],[http://synfig.org/Bugs],[synfig])
+AC_INIT([Synfig Core],[0.61.09],[http://synfig.org/Bugs],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 dnl AC_CANONICAL_TARGET
 
@@ -27,9 +27,10 @@ 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 ------------------------------------------
 
 AC_PROG_CC
@@ -39,7 +40,9 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
+
+AC_C_BIGENDIAN
 
 
 # -- A R G U M E N T S ----------------------------------------
@@ -246,6 +249,51 @@ if test $with_libavcodec = "yes" ; then {
 } ; fi
 
 
+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)])],
+		[],
+		[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])
+
+		# 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.])],
+			[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 +354,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 +367,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 {
@@ -328,6 +375,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
+
+
 
 
 
@@ -335,14 +395,14 @@ if test $use_openexr_half = yes ; then {
 
 AC_LIB_LTDL
 
-ALL_LINGUAS="es"
+ALL_LINGUAS="es fr ru"
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION([0.14.4])
+AM_GNU_GETTEXT_VERSION([0.15])
 localedir="$datadir/locale"
 
-PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[
-	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 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"
 
@@ -371,23 +431,8 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"])
 
 
 
-TARGET_TIF="yes"
 TARGET_PNG="yes"
 TARGET_MNG="yes"
-TARGET_JPEG="yes"
-
-if test "$TARGET_TIF" != "disabled" ; then
-AC_CHECK_LIB(tiff, TIFFClose,[
-	TIF_LIBS="-ltiff"
-	AC_DEFINE(HAVE_LIBTIFF,[], [ Define if TIFF library is available ] )
-	AC_SUBST(TIF_LIBS)
-	AM_CONDITIONAL(HAVE_LIBTIFF,true)
-],[
-	AC_MSG_RESULT([ *** TIFF Output target disabled])
-	TARGET_TIF="no"
-	AM_CONDITIONAL(HAVE_LIBTIFF,false)
-])
-fi
 
 AC_CHECK_LIB(png, png_write_row,[
 	PNG_LIBS="-lpng"
@@ -418,23 +463,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
 
 
 
@@ -534,9 +582,6 @@ AC_CHECK_FUNCS([fork])
 AC_CHECK_FUNCS([kill])
 AC_CHECK_FUNCS([pipe])
 AC_CHECK_FUNCS([waitpid])
-AC_CHECK_FUNCS([_spawnlp])
-AC_CHECK_FUNCS([_pipe])
-AC_CHECK_FUNCS([cwait])
 
 AC_CHECK_FUNCS(
 	[isnan],
@@ -577,6 +622,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"
@@ -604,8 +650,8 @@ AC_SUBST(API_VERSION)
 synfigincludedir=$includedir/synfig-$API_VERSION
 AC_SUBST(synfigincludedir)
 
-AC_OUTPUT(
-synfig-config
+AC_CONFIG_FILES([synfig-config
+build_tools/Makefile
 synfig.pc
 doxygen.cfg
 Makefile
@@ -633,15 +679,17 @@ src/modules/mod_particle/Makefile
 src/modules/mod_png/Makefile
 src/modules/mod_ppm/Makefile
 src/modules/mod_yuv420p/Makefile
+src/modules/example/Makefile
 src/tool/Makefile
 src/modules/synfig_modules.cfg
 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 --------------------------------------------
 
@@ -660,12 +708,12 @@ Debug Mode -----------------------> $debug ($debug_flags)
 Optimization ---------------------> $optimization
 PNG output target support --------> $TARGET_PNG
 MNG output target support --------> $TARGET_MNG
-TIFF output target support -------> $TARGET_TIF
 JPEG output target support -------> $TARGET_JPEG
 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