X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=992dfc58d22edbc1a0933f2be9922a1e0a52a504;hb=cede2ebda9fac39714e914268f6ecab52bb46b5f;hp=3e874cda91c19398d93fa65c72949869888ebd6d;hpb=ef6f90fbcc9ee541b6e5822a18754ed2749e9191;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 3e874cd..992dfc5 100644
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([Synfig Core],[0.61.08],[http://synfig.org/Bugs],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 dnl AC_CANONICAL_TARGET
 
@@ -39,7 +39,7 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 
 # -- A R G U M E N T S ----------------------------------------
@@ -341,8 +341,8 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.14.4])
 localedir="$datadir/locale"
 
-PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[
-	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 or greater).])
+PKG_CHECK_MODULES(ETL, [ETL >= 0.04.11],,[
+	AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.11 or greater).])
 ])
 CONFIG_DEPS="$CONFIG_DEPS ETL"
 
@@ -371,24 +371,10 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"])
 
 
 
-TARGET_TIF="yes"
 TARGET_PNG="yes"
 TARGET_MNG="yes"
 TARGET_JPEG="yes"
 
-if test "$TARGET_TIF" != "disabled" ; then
-AC_CHECK_LIB(tiff, TIFFClose,[
-	TIF_LIBS="-ltiff"
-	AC_DEFINE(HAVE_LIBTIFF,[], [ Define if TIFF library is available ] )
-	AC_SUBST(TIF_LIBS)
-	AM_CONDITIONAL(HAVE_LIBTIFF,true)
-],[
-	AC_MSG_RESULT([ *** TIFF Output target disabled])
-	TARGET_TIF="no"
-	AM_CONDITIONAL(HAVE_LIBTIFF,false)
-])
-fi
-
 AC_CHECK_LIB(png, png_write_row,[
 	PNG_LIBS="-lpng"
 	AC_DEFINE(HAVE_LIBPNG,[], [ Define if PNG library is available ] )
@@ -601,8 +587,7 @@ AC_SUBST(API_VERSION)
 synfigincludedir=$includedir/synfig-$API_VERSION
 AC_SUBST(synfigincludedir)
 
-AC_OUTPUT(
-synfig-config
+AC_CONFIG_FILES([synfig-config
 synfig.pc
 doxygen.cfg
 Makefile
@@ -638,7 +623,8 @@ win32inst.nsi
 pkg-info/macosx/synfig-core.info
 dnl src/modules/trgt_mpg/Makefile
 dnl src/modules/mptr_mplayer/Makefile
-)
+])
+AC_OUTPUT
 
 # -- S U M M A R Y --------------------------------------------
 
@@ -657,7 +643,6 @@ 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