X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=951cf29e5484fa09b6b340ce3d3832e232423551;hb=471b49dfa2c42729b5cb72dd9547d4c2dcb0a2b1;hp=b10a1d37d26b9a2cb1e1d8241f9133765860aed5;hpb=c330cbb315df4b609c494e324b9b248a4e5f3598;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index b10a1d3..951cf29 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -1,4 +1,4 @@
-i# $Header: /opt/voria/cvs/synfig/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $
+# $Id$
 
 # -- I N I T --------------------------------------------------
 
@@ -197,26 +197,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,[
@@ -292,6 +292,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
 
 
@@ -302,8 +305,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"
 
@@ -334,6 +337,7 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"])
 
 TARGET_TIF="yes"
 TARGET_PNG="yes"
+TARGET_MNG="no"
 TARGET_JPEG="yes"
 
 if test "$TARGET_TIF" != "disabled" ; then
@@ -367,6 +371,17 @@ AC_CHECK_LIB(png, png_write_row,[
 	],[-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"
 	AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] )
@@ -499,6 +514,8 @@ AC_SUBST(LIBADD_DL)
 
 AC_SUBST(SYNFIG_LIBS)
 AC_SUBST(SYNFIG_CFLAGS)
+AC_SUBST(OPENEXR_HALF_LIBS)
+
 AC_SUBST(API_VERSION)
 
 synfigincludedir=$includedir/synfig-@API_VERSION@
@@ -515,6 +532,8 @@ AC_SUBST(synfigincludedir)
 	
 )]
 
+# src/modules/mod_mng/Makefile
+
 AC_OUTPUT(
 synfig-config
 @PACKAGE_TARNAME@.pc
@@ -542,6 +561,7 @@ src/modules/mod_yuv420p/Makefile
 src/modules/mod_particle/Makefile
 src/tool/Makefile
 src/modules/synfig_modules.cfg
+examples/walk/Makefile
 examples/Makefile
 win32inst.nsi
 pkg-info/macosx/synfig-core.info
@@ -566,26 +586,26 @@ 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
+fontconfig -----------------------> $with_fontconfig
 libavcodec -----------------------> $with_libavcodec
 vImage ---------------------------> $with_vimage
-GLib -----------------------------> $GLIB
 ImageMagick ----------------------> $with_imagemagick
 FFMPEG ---------------------------> $with_ffmpeg
 libdv ----------------------------> $with_libdv
 OpenEXR --------------------------> $with_openexr
 Using OpenEXR's \"half\" type ------> $use_openexr_half
 
-"'$'"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'
+"'$'"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'
 "