GNOME.org
 

anjuta r3921 - in trunk: . plugins/project-wizard/templates/cpp plugins/project-wizard/templates/gcj plugins/project-wizard/templates/java plugins/project-wizard/templates/minimal plugins/project-wizard/templates/python plugins/project-wizard/templates/sdl plugins/project-wizard/templates/terminal plugins/project-wizard/templates/wxwin plugins/project-wizard/templates/xlib

Author: jhs
Date: Thu May  8 08:16:03 2008
New Revision: 3921
URL: http://svn.gnome.org/viewvc/anjuta?rev=3921&view=rev

Log:
2008-05-08  Johannes Schmid  <jhs gnome org>

	Patch from Eduardo PÃrez Ureta <edpeur gmail com>

	* plugins/project-wizard/templates/cpp/configure.ac.tpl:
	* plugins/project-wizard/templates/gcj/configure.ac.tpl:
	* plugins/project-wizard/templates/java/configure.ac.tpl:
	* plugins/project-wizard/templates/minimal/autogen.sh:
	* plugins/project-wizard/templates/minimal/configure.ac.tpl:
	* plugins/project-wizard/templates/python/configure.ac.tpl:
	* plugins/project-wizard/templates/sdl/configure.ac.tpl:
	* plugins/project-wizard/templates/wxwin/configure.ac.tpl:
	* plugins/project-wizard/templates/xlib/configure.ac.tpl:
	
	#531405 â AM_CONFIG_HEADER macro is obsolete
	
	project-wizard is creating new projects using the AM_CONFIG_HEADER obsolete macro:
	http://www.gnu.org/software/automake/manual/automake.html#Obsolete-macros

Modified:
   trunk/ChangeLog
   trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl
   trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl
   trunk/plugins/project-wizard/templates/java/configure.ac.tpl
   trunk/plugins/project-wizard/templates/minimal/autogen.sh
   trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl
   trunk/plugins/project-wizard/templates/python/configure.ac.tpl
   trunk/plugins/project-wizard/templates/sdl/configure.ac.tpl
   trunk/plugins/project-wizard/templates/terminal/ChangeLog
   trunk/plugins/project-wizard/templates/terminal/autogen.sh
   trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl
   trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl
   trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl

Modified: trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/cpp/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX

Modified: trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/gcj/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC

Modified: trunk/plugins/project-wizard/templates/java/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/java/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/java/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 [+IF (=(get "HaveI18n") "1")+]

Modified: trunk/plugins/project-wizard/templates/minimal/autogen.sh
==============================================================================
--- trunk/plugins/project-wizard/templates/minimal/autogen.sh	(original)
+++ trunk/plugins/project-wizard/templates/minimal/autogen.sh	Thu May  8 08:16:03 2008
@@ -137,7 +137,7 @@
       fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+      if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
       fi

Modified: trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/minimal/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX

Modified: trunk/plugins/project-wizard/templates/python/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/python/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/python/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AM_PATH_PYTHON

Modified: trunk/plugins/project-wizard/templates/sdl/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/sdl/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/sdl/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -7,7 +7,7 @@
 SDL_REQUIRED=[+SDL_Version+]
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX

Modified: trunk/plugins/project-wizard/templates/terminal/autogen.sh
==============================================================================
--- trunk/plugins/project-wizard/templates/terminal/autogen.sh	(original)
+++ trunk/plugins/project-wizard/templates/terminal/autogen.sh	Thu May  8 08:16:03 2008
@@ -137,7 +137,7 @@
       fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+      if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
       fi

Modified: trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/terminal/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX

Modified: trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/wxwin/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX

Modified: trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl
==============================================================================
--- trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl	(original)
+++ trunk/plugins/project-wizard/templates/xlib/configure.ac.tpl	Thu May  8 08:16:03 2008
@@ -5,7 +5,7 @@
 AC_INIT([+NameHLower+], [+Version+])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]