X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=226f5b95fe0111f446a23d1f6a07b7b37cc45c38;hb=88a964cff54a732fd42f3a479122a0b1894c8852;hp=faef8585360abf15c5d6edb720ff3cb6fe000eb6;hpb=eb9fc9c8065742402bc8946b5c8624b892cc0bfc;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index faef858..226f5b9 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,[
@@ -229,7 +229,11 @@ if test $with_freetype != "no" ; then {
 	PKG_CHECK_MODULES(FREETYPE, freetype2,[
 		with_freetype="yes"
 	],[
-		with_freetype="no"
+		PKG_CHECK_MODULES(FREETYPE, xft,[
+			with_freetype="yes"
+		],[
+			with_freetype="no"
+		])
 	])
 } ; fi
 
@@ -288,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
 
 
@@ -495,6 +502,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@
@@ -566,22 +575,21 @@ 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'
 "