X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=dae5009f271aaabe09ec904209dafedf98f26454;hb=a9a9970c7303c616abb61b56754746cd86167fd3;hp=9345e7725dfc9ac5beaf1b99b10a3df9d5a5d7eb;hpb=6a271229bf821e96db38c918f02c6c14786043ec;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 9345e77..dae5009 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -197,26 +197,29 @@ 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,[with_libavcodec="yes"],[with_libavcodec="no"])
+} ; fi
+if test $with_libavcodec != "no" ; then {
+	PKG_CHECK_MODULES(LIBAVFORMAT, libavformat,[with_libavcodec="yes"],[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,[
@@ -225,22 +228,16 @@ AC_ARG_WITH(freetype,[
 	with_freetype="yes"
 ])
 
-
 if test $with_freetype != "no" ; then {
-	PKG_CHECK_MODULES(FREETYPE, xft freetype2 fontconfig,[
+	PKG_CHECK_MODULES(FREETYPE, freetype2,[
 		with_freetype="yes"
 	],[
-		PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[
+		PKG_CHECK_MODULES(FREETYPE, xft,[
 			with_freetype="yes"
 		],[
 			with_freetype="no"
 		])
 	])
-#	AC_CHECK_FT2(,[
-#		with_freetype="yes"
-#	],[
-#		with_freetype="no"
-#	])	
 } ; fi
 
 if test $with_freetype = "no" ; then {
@@ -250,8 +247,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------------------------
@@ -556,6 +573,7 @@ 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