# -- 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)
# -- 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
AC_LANG([C++])
+AC_C_BIGENDIAN
+
# -- A R G U M E N T S ----------------------------------------
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)])],
)
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--------------------
} ; 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
+
+
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"
TARGET_PNG="yes"
TARGET_MNG="yes"
-TARGET_JPEG="yes"
AC_CHECK_LIB(png, png_write_row,[
PNG_LIBS="-lpng"
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
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"
AC_SUBST(synfigincludedir)
AC_CONFIG_FILES([synfig-config
+build_tools/Makefile
synfig.pc
doxygen.cfg
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