X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=6627b39d46dd31dcd7ae58ea636b9750f6b15e5e;hb=e4e009ea389e1d04f74d2ab91f8fa2467e6eb8bc;hp=17b7ba0d00631c4b6e50938878b4141cb3acdb6e;hpb=22a1b6cf67b85efcf212cf85f0094eb3f9ea6af0;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 17b7ba0..6627b39 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 ----------------------------------------
@@ -306,8 +306,6 @@ AC_ARG_WITH(openexr,[
 ])
 if test $with_openexr = "yes" ; then {
 	PKG_CHECK_MODULES(OPENEXR, OpenEXR,[
-		CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
-	
 		AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ] )
 		AM_CONDITIONAL(WITH_OPENEXR,true)
 	],
@@ -321,6 +319,7 @@ if test $with_openexr = "no" ; then {
 } ; fi
 if test $use_openexr_half = yes ; then {
 	AC_MSG_RESULT([ ** Using OpenEXR Half.])
+	CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
 	CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
 	OPENEXR_HALF_LIBS="-lHalf"
 } else {
@@ -587,8 +586,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
@@ -624,7 +622,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 --------------------------------------------