From: pabs <pabs@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Thu, 20 Mar 2008 04:16:16 +0000 (+0000)
Subject: Update configure.ac as suggested by autoupdate.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=cede2ebda9fac39714e914268f6ecab52bb46b5f;p=synfig.git

Update configure.ac as suggested by autoupdate.


git-svn-id: http://svn.voria.com/code@1916 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/ETL/trunk/configure.ac b/ETL/trunk/configure.ac
index 00de6b3..4d5af76 100644
--- a/ETL/trunk/configure.ac
+++ b/ETL/trunk/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([Extended Template Library],[0.04.11],[http://synfig.org/Bugs],[ETL])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(ETL/etl_profile_.h)
+AC_CONFIG_HEADERS([ETL/etl_profile_.h])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
@@ -30,7 +30,7 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 AC_ARG_WARNINGS
 AC_ARG_DEBUG
@@ -72,14 +72,14 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-AC_OUTPUT(
-ETL-config
+AC_CONFIG_FILES([ETL-config
 Makefile
 ETL/Makefile
 test/Makefile
 ETL.pc
 doxygen.cfg
-)
+])
+AC_OUTPUT
 
 # -- S U M M A R Y --------------------------------------------
 
diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 17b7ba0..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 ----------------------------------------
@@ -587,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
@@ -624,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 --------------------------------------------
 
diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac
index 3e9396b..d001cf8 100755
--- a/synfig-studio/trunk/configure.ac
+++ b/synfig-studio/trunk/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([Synfig Studio],[0.61.08],[http://synfig.org/Bugs],[synfigstudio])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 dnl AC_CANONICAL_TARGET
 
@@ -28,7 +28,7 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 
 AC_ARG_DEBUG
@@ -265,8 +265,7 @@ AC_SUBST(imageext)
 imagedir="${datadir}/pixmaps/synfigstudio"
 AC_SUBST(imagedir)
 
-AC_OUTPUT(
-Makefile
+AC_CONFIG_FILES([Makefile
 build_tools/Makefile
 doxygen.cfg
 po/Makefile.in
@@ -281,7 +280,8 @@ src/synfigapp/Makefile
 images/Makefile
 win32inst.nsi
 pkg-info/macosx/synfig-studio.info
-)
+])
+AC_OUTPUT
 
 # -- S U M M A R Y --------------------------------------------