X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=3f1b7b63d4a0cff01a8c1aa695bddc0e7117c3a8;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=2e7e7b054e443a8758a4e1cf5449e43eeebb2249;hpb=2d09de1dc113f1366f06265a2a246263c4370920;p=synfig.git diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index 2e7e7b0..3f1b7b6 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,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 @@ -41,6 +42,8 @@ AC_PROG_INSTALL 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-------------------- @@ -327,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 + + @@ -334,14 +395,14 @@ if test $use_openexr_half = yes ; then { AC_LIB_LTDL -ALL_LINGUAS="es fr" +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.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" @@ -372,7 +433,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" @@ -403,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 @@ -559,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" @@ -587,6 +651,7 @@ synfigincludedir=$includedir/synfig-$API_VERSION AC_SUBST(synfigincludedir) AC_CONFIG_FILES([synfig-config +build_tools/Makefile synfig.pc doxygen.cfg Makefile @@ -614,6 +679,8 @@ src/modules/mod_particle/Makefile src/modules/mod_png/Makefile src/modules/mod_ppm/Makefile src/modules/mod_yuv420p/Makefile +src/modules/mod_svg/Makefile +src/modules/example/Makefile src/tool/Makefile src/modules/synfig_modules.cfg examples/walk/Makefile @@ -647,6 +714,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