X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=faef8585360abf15c5d6edb720ff3cb6fe000eb6;hb=7e6a1eb31322a853ebc47393a1f3dd6f124b6d33;hp=cc4efcf5ef4626a7f6c4b0a0158413d464022734;hpb=2867cf6ab83e50625575cbbd0d1da16a5ada3aa3;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index cc4efcf..faef858 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -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)
 
@@ -140,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)
@@ -224,22 +225,12 @@ AC_ARG_WITH(freetype,[
 	with_freetype="yes"
 ])
 
-
 if test $with_freetype != "no" ; then {
-	PKG_CHECK_MODULES(FREETYPE, xft fontconfig,[
+	PKG_CHECK_MODULES(FREETYPE, freetype2,[
 		with_freetype="yes"
 	],[
-		PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[
-			with_freetype="yes"
-		],[
-			with_freetype="no"
-		])
+		with_freetype="no"
 	])
-#	AC_CHECK_FT2(,[
-#		with_freetype="yes"
-#	],[
-#		with_freetype="no"
-#	])	
 } ; fi
 
 if test $with_freetype = "no" ; then {
@@ -249,8 +240,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------------------------
@@ -340,9 +351,16 @@ 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)
+	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(jpeg, main,[
@@ -548,6 +566,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