X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=ca34e20a3ccfc5f8f453876e16b855630a4a73f1;hb=a11a35f647a3a6e61518ddfd61c9e199e25da3ef;hp=fb6a6cae1f7b64a0a54f6c970f2094e26ffaddf4;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index fb6a6ca..ca34e20 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -1,4 +1,4 @@
-i# $Header: /opt/voria/cvs/sinfg/config/configure.ac,v 1.9 2005/01/23 04:03:21 darco Exp $
+# $Id$
 
 # -- I N I T --------------------------------------------------
 
@@ -15,7 +15,7 @@ dnl AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
-AC_LIBLTDL_CONVENIENCE
+AC_LIBLTDL_INSTALLABLE
 AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 
@@ -29,6 +29,8 @@ AC_DEFINE(LT_SCOPE,[extern],[LibLTDL is linked staticly])
 
 # -- V A R I A B L E S ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+AC_SUBST(SVN_REPOSITORY)
 
 # -- P R O G R A M S ------------------------------------------
 
@@ -129,7 +131,7 @@ AC_ARG_ENABLE(layer-profiling,[
 	use_layerprofiling="no"
 ])
 if test $use_layerprofiling = "yes" ; then {
-	AC_DEFINE(SINFG_PROFILE_LAYERS,[1],[enable layer profiling])	
+	AC_DEFINE(SYNFIG_PROFILE_LAYERS,[1],[enable layer profiling])	
 } ; fi
 
 
@@ -138,7 +140,8 @@ if test $use_layerprofiling = "yes" ; then {
 AC_ARG_WITH(imagemagick,[
   --without-imagemagick   Disable support for ImageMagick],[
 ],[
-	with_imagemagick="yes"
+    AC_CHECK_PROG([imagemagick_convert],[convert],[yes],[no])
+    with_imagemagick=$imagemagick_convert
 ])
 if test $with_imagemagick = "no" ; then {
 	AM_CONDITIONAL(WITH_IMAGEMAGICK,false)
@@ -150,6 +153,39 @@ if test $with_imagemagick = "no" ; then {
 
 
 
+AC_ARG_WITH(magickpp,[
+  --without-magickpp        Disable support for Magick++],[
+],[
+	with_magickpp="yes"
+])
+if test $with_magickpp = "yes" ; then {
+  AC_CHECK_HEADER([Magick++.h],[
+  	MAGICKPP_LIBS="-lMagick++"
+  	AC_DEFINE(HAVE_MAGICKPP,[], [ Define if Magick++ library is available ] )
+  	AC_SUBST(MAGICKPP_LIBS)
+  	AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
+	AC_CHECK_LIB(Magick,OptimizeImageTransparency,[
+		AC_DEFINE(HAVE_MAGICK_OPTIMIZE,[], [ Define if Magick++ defines OptimizeImageTransparency() ] )
+		AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,true)
+	],[
+		AC_MSG_RESULT([ *** OptimizeImageTransparency() not available - need ImageMagick 6.3 or newer ])
+		AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,false)
+	])
+  ],[
+	with_magickpp="no"
+  	AC_MSG_RESULT([ *** Magick++ Output target disabled])
+  	TARGET_MAGICKPP="no"
+  	AM_CONDITIONAL(HAVE_LIBMAGICKPP,false)
+	AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,false)
+  ])
+} else {
+	AM_CONDITIONAL(HAVE_LIBMAGICKPP,false)
+	AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,false)
+} ; fi
+
+
+
+
 AC_ARG_WITH(ffmpeg,[
   --without-ffmpeg        Disable support for FFMPEG],[
 ],[
@@ -194,26 +230,26 @@ if test $with_libdv = "no" ; then {
 
 
 
+# LIBAVCODEC CHECK--------------------
 
 AC_ARG_WITH(libavcodec,[
-  --with-libavcodec         Enable support for libavcodec (Default=auto)],[
+  --without-libavcodec         disable support for libavcodec (Default=auto)],[
 ],[
-	AC_CHECK_LIB(avcodec, avcodec_find_encoder,[
-		with_libavcodec="yes"
-	],[
-		with_libavcodec="no"
-	])
+	with_libavcodec="yes"
 ])
-if test $with_libavcodec = "no" ; then {
-	AM_CONDITIONAL(WITH_LIBAVCODEC,false)
-} else {
+
+if test $with_libavcodec != "no" ; then {
+	PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec libavformat],[],[echo no; with_libavcodec="no"])
+} ; fi
+if test $with_libavcodec = "yes" ; then {
+	AC_DEFINE(WITH_LIBAVCODEC,[],[enable libavcodec support])
 	AM_CONDITIONAL(WITH_LIBAVCODEC,true)
+} else {
+	AM_CONDITIONAL(WITH_LIBAVCODEC,false)
 } ; fi
 
 
 
-
-
 # FREETYPE2 CHECK--------------------
 
 AC_ARG_WITH(freetype,[
@@ -222,13 +258,16 @@ AC_ARG_WITH(freetype,[
 	with_freetype="yes"
 ])
 
-
 if test $with_freetype != "no" ; then {
-	AC_CHECK_FT2(,[
+	PKG_CHECK_MODULES(FREETYPE, freetype2,[
 		with_freetype="yes"
 	],[
-		with_freetype="no"
-	])	
+		PKG_CHECK_MODULES(FREETYPE, xft,[
+			with_freetype="yes"
+		],[
+			with_freetype="no"
+		])
+	])
 } ; fi
 
 if test $with_freetype = "no" ; then {
@@ -238,8 +277,28 @@ if test $with_freetype = "no" ; then {
 } ; fi
 
 
+# FONTCONFIG CHECK--------------------
 
+AC_ARG_WITH(fontconfig,[
+  --without-fontconfig         disable support for fontconfig (Default=auto)],[
+],[
+	with_fontconfig="yes"
+])
 
+if test $with_fontconfig != "no" ; then {
+	PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[
+		with_fontconfig="yes"
+	],[
+		with_fontconfig="no"
+	])
+} ; fi
+
+if test $with_fontconfig = "yes" ; then {
+	AC_DEFINE(WITH_FONTCONFIG,[],[enable fontconfig support])
+	AM_CONDITIONAL(WITH_FONTCONFIG,true)
+} else {
+	AM_CONDITIONAL(WITH_FONTCONFIG,false)
+} ; fi
 
 
 # OPENEXR CHECK------------------------
@@ -266,6 +325,9 @@ if test $with_openexr = "no" ; then {
 if test $use_openexr_half = yes ; then {
 	AC_MSG_RESULT([ ** Using OpenEXR Half.])
 	CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
+	OPENEXR_HALF_LIBS="-lHalf"
+} else {
+	OPENEXR_HALF_LIBS=""
 } ; fi
 
 
@@ -276,8 +338,8 @@ if test $use_openexr_half = yes ; then {
 
 AC_LIB_LTDL
 
-PKG_CHECK_MODULES(ETL, ETL,,[
-	AC_MSG_ERROR([ ** You need to install the ETL.])
+PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[
+	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 or greater).])
 ])
 CONFIG_DEPS="$CONFIG_DEPS ETL"
 
@@ -308,6 +370,7 @@ 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
@@ -329,10 +392,28 @@ AC_CHECK_LIB(png, png_write_row,[
 	AC_SUBST(PNG_LIBS)
 	AM_CONDITIONAL(HAVE_LIBPNG,true)
 ],[
-	AC_MSG_RESULT([ *** PNG Output target disabled])
-	TARGET_PNG="no"
-	AM_CONDITIONAL(HAVE_LIBPNG,false)
-],[-lz])
+	AC_CHECK_LIB(png12, png_write_row,[
+	PNG_LIBS="-lpng12"
+	AC_DEFINE(HAVE_LIBPNG,[])
+	AC_SUBST(PNG_LIBS)
+	AM_CONDITIONAL(HAVE_LIBPNG,true)
+	],[
+		AC_MSG_RESULT([ *** PNG Output target disabled])
+		TARGET_PNG="no"
+		AM_CONDITIONAL(HAVE_LIBPNG,false)
+	],[-lz -L${exec_prefix}/lib])
+],[-lz -L${exec_prefix}/lib])
+
+AC_CHECK_LIB(mng, mng_initialize,[
+	MNG_LIBS="-lmng -lz"
+	AC_DEFINE(HAVE_LIBMNG,[], [ Define if MNG library is available ] )
+	AC_SUBST(MNG_LIBS)
+	AM_CONDITIONAL(HAVE_LIBMNG,true)
+],[
+	AC_MSG_RESULT([ *** MNG Output target disabled])
+	TARGET_MNG="no"
+	AM_CONDITIONAL(HAVE_LIBMNG,false)
+],[-lz -L${exec_prefix}/lib])
 
 AC_CHECK_LIB(jpeg, main,[
 	JPEG_LIBS="-ljpeg"
@@ -343,7 +424,7 @@ AC_CHECK_LIB(jpeg, main,[
 	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,[],[
@@ -354,11 +435,11 @@ dnl ])
 
 
 
-MODULE_DIR=$libdir/sinfg/modules
-moduledir=$libdir/sinfg/modules
+MODULE_DIR='${libdir}/synfig/modules'
+moduledir=$libdir/synfig/modules
 AC_SUBST(MODULE_DIR)
-SINFGLIB_DIR=$libdir/sinfg
-AC_SUBST(SINFGLIB_DIR)
+SYNFIGLIB_DIR=$libdir/synfig
+AC_SUBST(SYNFIGLIB_DIR)
 
 
 
@@ -366,7 +447,25 @@ AC_SUBST(SINFGLIB_DIR)
 
 CXXFLAGS="$CXXFLAGS -fpermissive"
 
-AC_CHECK_HEADERS(signal.h termios.h)
+AC_CHECK_HEADERS(signal.h termios.h sys/errno.h)
+
+
+case "$host" in
+	*mingw* | *cygwin*)
+		AM_CONDITIONAL(WIN32_PKG, true)
+		AM_CONDITIONAL(MACOSX_PKG, false)
+	;;
+	*darwin*)
+		AM_CONDITIONAL(WIN32_PKG, false)
+		AM_CONDITIONAL(MACOSX_PKG, true)
+	;;
+	*)
+		AM_CONDITIONAL(WIN32_PKG, false)
+		AM_CONDITIONAL(MACOSX_PKG, false)
+	;;
+esac
+		
+		
 
 # -- H E A D E R S --------------------------------------------
 
@@ -430,28 +529,30 @@ AC_SUBST(VERSION_REV)
 
 dnl AC_CONFIG_SUBDIRS(libltdl)
 
-CONFIG_LIBS="-lsinfg"
+CONFIG_LIBS="-lsynfig"
 CONFIG_CFLAGS="$CONFIG_CFLAGS"
 AC_SUBST(CONFIG_LIBS)
 AC_SUBST(CONFIG_CFLAGS)
 AC_SUBST(CONFIG_DEPS)
 AC_SUBST(ETL_CFLAGS)
 
-SINFG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $OPENEXR_LIBS $LIBSIGC_LIBS"
-SINFG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $OPENEXR_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSINFG_NO_DEPRECATED"
+SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $LIBSIGC_LIBS"
+SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED"
 
 CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-SINFG_CFLAGS="`echo $SINFG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-SINFG_LIBS="`echo $SINFG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
+SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
+SYNFIG_LIBS="`echo $SYNFIG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
 
 AC_SUBST(LIBADD_DL)
 
-AC_SUBST(SINFG_LIBS)
-AC_SUBST(SINFG_CFLAGS)
+AC_SUBST(SYNFIG_LIBS)
+AC_SUBST(SYNFIG_CFLAGS)
+AC_SUBST(OPENEXR_HALF_LIBS)
+
 AC_SUBST(API_VERSION)
 
-sinfgincludedir=$includedir/sinfg-@API_VERSION@
-AC_SUBST(sinfgincludedir)
+synfigincludedir=$includedir/synfig-@API_VERSION@
+AC_SUBST(synfigincludedir)
 
 [(
 	[ -d libltdl ] || mkdir libltdl;
@@ -465,34 +566,38 @@ AC_SUBST(sinfgincludedir)
 )]
 
 AC_OUTPUT(
-sinfg-config
+synfig-config
 @PACKAGE_TARNAME@.pc
 Makefile
 src/Makefile
-src/sinfg/Makefile
+src/synfig/Makefile
 src/modules/Makefile
-src/modules/example/Makefile
-src/modules/mod_filter/Makefile
-src/modules/mod_bmp/Makefile
-src/modules/mod_gif/Makefile
-src/modules/mod_ppm/Makefile
-src/modules/mod_png/Makefile
-src/modules/mod_jpeg/Makefile
+src/modules/lyr_freetype/Makefile
 src/modules/lyr_std/Makefile
+src/modules/mod_bmp/Makefile
+src/modules/mod_dv/Makefile
+src/modules/mod_ffmpeg/Makefile
+src/modules/mod_filter/Makefile
 src/modules/mod_geometry/Makefile
+src/modules/mod_gif/Makefile
 src/modules/mod_gradient/Makefile
-src/modules/mod_noise/Makefile
-src/modules/lyr_freetype/Makefile
-src/modules/mod_ffmpeg/Makefile
-src/modules/mod_dv/Makefile
 src/modules/mod_imagemagick/Makefile
-src/modules/mod_openexr/Makefile
+src/modules/mod_jpeg/Makefile
 src/modules/mod_libavcodec/Makefile
-src/modules/mod_yuv420p/Makefile
+src/modules/mod_magickpp/Makefile
+src/modules/mod_mng/Makefile
+src/modules/mod_noise/Makefile
+src/modules/mod_openexr/Makefile
 src/modules/mod_particle/Makefile
+src/modules/mod_png/Makefile
+src/modules/mod_ppm/Makefile
+src/modules/mod_yuv420p/Makefile
 src/tool/Makefile
-src/modules/sinfg_modules.cfg
+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
 )
@@ -514,25 +619,27 @@ GProf Profiling ------------------> $profiling
 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
 vImage ---------------------------> $with_vimage
-GLib -----------------------------> $GLIB
 ImageMagick ----------------------> $with_imagemagick
+Magick++ -------------------------> $with_magickpp
 FFMPEG ---------------------------> $with_ffmpeg
 libdv ----------------------------> $with_libdv
 OpenEXR --------------------------> $with_openexr
 Using OpenEXR's \"half\" type ------> $use_openexr_half
 
-"'$'"CXX ------------------------------> '$CXX'
-"'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
-"'$'"SINFG_LIBS -----------------------> '$SINFG_LIBS'
-"'$'"LIBXMLPP_LIBS --------------------> '$LIBXMLPP_LIBS'
-"'$'"ETL_LIBS -------------------------> '$ETL_LIBS'
-"'$'"LIBSIGC_LIBS ---------------------> '$LIBSIGC_LIBS'
-"'$'"SINFG_CFLAGS ---------------------> '$SINFG_CFLAGS'
-"'$'"LIBADD_DL ------------------------> '$LIBADD_DL'
+"'$'"CXX -----------------------------> '$CXX'
+"'$'"CXXFLAGS ------------------------> '$CXXFLAGS'
+"'$'"SYNFIG_LIBS ---------------------> '$SYNFIG_LIBS'
+"'$'"LIBXMLPP_LIBS -------------------> '$LIBXMLPP_LIBS'
+"'$'"ETL_LIBS ------------------------> '$ETL_LIBS'
+"'$'"LIBSIGC_LIBS --------------------> '$LIBSIGC_LIBS'
+"'$'"SYNFIG_CFLAGS -------------------> '$SYNFIG_CFLAGS'
+"'$'"LIBADD_DL -----------------------> '$LIBADD_DL'
 "