X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=dd673c247f024141774c6ab074d5623316fa3cf7;hb=394274ce3abac3144d8246636fd98b508b8880be;hp=037023a28fc96ea7654eb3ec8e9c184c203985b2;hpb=6358a1a4ac761de63e608ad4c940bef9fd27b99f;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index 037023a..dd673c2 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)
 
@@ -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 ------------------------------------------
 
@@ -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)
@@ -194,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,[
@@ -222,22 +225,16 @@ 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,[
+		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 {
@@ -247,8 +244,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------------------------
@@ -338,9 +355,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,[
@@ -375,7 +399,7 @@ AC_SUBST(SYNFIGLIB_DIR)
 
 CXXFLAGS="$CXXFLAGS -fpermissive"
 
-AC_CHECK_HEADERS(signal.h termios.h)
+AC_CHECK_HEADERS(signal.h termios.h sys/errno.h)
 
 
 case "$host" in
@@ -518,6 +542,7 @@ src/modules/mod_yuv420p/Makefile
 src/modules/mod_particle/Makefile
 src/tool/Makefile
 src/modules/synfig_modules.cfg
+examples/Makefile
 win32inst.nsi
 pkg-info/macosx/synfig-core.info
 dnl src/modules/trgt_mpg/Makefile
@@ -545,21 +570,21 @@ 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
 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'
 "