[anjuta] project-wizard: Update project wizard templates

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 1ea1a4db108a97a79130c7cc8af12216fbf79648
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sun Sep 4 13:11:19 2011 +0200

    project-wizard: Update project wizard templates

 .../templates/anjuta-plugin/configure.ac.tpl       |   43 +++---------------
 .../project-wizard/templates/cpp/configure.ac.tpl  |   46 ++++---------------
 .../project-wizard/templates/gcj/configure.ac.tpl  |   13 +++--
 .../project-wizard/templates/java/configure.ac.tpl |   46 ++++---------------
 .../project-wizard/templates/js_minimal/autogen.sh |    4 +-
 .../templates/js_minimal/configure.ac.tpl          |    8 ++-
 .../templates/library/configure.ac.tpl             |   46 ++++---------------
 .../templates/minimal/configure.ac.tpl             |    6 ++-
 .../templates/pygtk/configure.ac.tpl               |   41 +++---------------
 .../templates/python/configure.ac.tpl              |   44 +++---------------
 .../project-wizard/templates/sdl/configure.ac.tpl  |   15 ++++---
 .../project-wizard/templates/terminal/autogen.sh   |    4 +-
 .../templates/terminal/configure.ac.tpl            |   47 ++++---------------
 .../templates/vala-gtk/configure.ac.tpl            |    8 ++-
 .../templates/wxwin/configure.ac.tpl               |   13 +++--
 .../project-wizard/templates/xlib/configure.ac.tpl |   13 +++--
 16 files changed, 109 insertions(+), 288 deletions(-)
---
diff --git a/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl b/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl
index e487145..07f8dcb 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl
+++ b/plugins/project-wizard/templates/anjuta-plugin/configure.ac.tpl
@@ -4,8 +4,9 @@ dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
@@ -17,17 +18,18 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 PKG_CHECK_MODULES(LIBANJUTA, [libanjuta-1.0])
@@ -56,38 +58,7 @@ AC_SUBST(anjuta_glade_dir)
 AC_SUBST(anjuta_image_dir)
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/cpp/configure.ac.tpl b/plugins/project-wizard/templates/cpp/configure.ac.tpl
index 718fad5..98cc9f4 100644
--- a/plugins/project-wizard/templates/cpp/configure.ac.tpl
+++ b/plugins/project-wizard/templates/cpp/configure.ac.tpl
@@ -3,12 +3,14 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CXX
 
 [+IF (=(get "HaveLangCPP") "1")+]
@@ -18,17 +20,18 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
@@ -36,38 +39,7 @@ PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+]])
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/gcj/configure.ac.tpl b/plugins/project-wizard/templates/gcj/configure.ac.tpl
index 506f2a8..accb614 100644
--- a/plugins/project-wizard/templates/gcj/configure.ac.tpl
+++ b/plugins/project-wizard/templates/gcj/configure.ac.tpl
@@ -3,24 +3,27 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
+
+AM_INIT_AUTOMAKE([1.11])
+AM_MAINTAINER_MODE()
+
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 AM_PROG_GCJ
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
diff --git a/plugins/project-wizard/templates/java/configure.ac.tpl b/plugins/project-wizard/templates/java/configure.ac.tpl
index f255088..5ac5f2c 100644
--- a/plugins/project-wizard/templates/java/configure.ac.tpl
+++ b/plugins/project-wizard/templates/java/configure.ac.tpl
@@ -3,21 +3,24 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
+
+AM_INIT_AUTOMAKE([1.11])
+AM_MAINTAINER_MODE()
+
+AM_SILENT_RULES([yes])
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
@@ -25,38 +28,7 @@ PKG_CHECK_MODULES(PACKAGE, [[+PackageModule1+] [+PackageModule2+]])
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/js_minimal/autogen.sh b/plugins/project-wizard/templates/js_minimal/autogen.sh
index 957e18f..11825eb 100644
--- a/plugins/project-wizard/templates/js_minimal/autogen.sh
+++ b/plugins/project-wizard/templates/js_minimal/autogen.sh
@@ -49,7 +49,7 @@ fi
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+(grep "^LT_INIT" $srcdir/configure.ac >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -129,7 +129,7 @@ do
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+      if grep "^LT_INIT" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
diff --git a/plugins/project-wizard/templates/js_minimal/configure.ac.tpl b/plugins/project-wizard/templates/js_minimal/configure.ac.tpl
index 1d10788..e517ecb 100644
--- a/plugins/project-wizard/templates/js_minimal/configure.ac.tpl
+++ b/plugins/project-wizard/templates/js_minimal/configure.ac.tpl
@@ -3,13 +3,15 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11 foreign])
 AM_MAINTAINER_MODE
 
-AM_PROG_LIBTOOL
+AM_SILENT_RULES([yes])
+
+LT_INIT
 
 AC_OUTPUT([
 Makefile
diff --git a/plugins/project-wizard/templates/library/configure.ac.tpl b/plugins/project-wizard/templates/library/configure.ac.tpl
index 7e194a0..f7ff265 100644
--- a/plugins/project-wizard/templates/library/configure.ac.tpl
+++ b/plugins/project-wizard/templates/library/configure.ac.tpl
@@ -3,12 +3,14 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CC
 
 [+IF (=(get "HaveLangCPP") "1")+]
@@ -18,57 +20,27 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+CASE (get "LibraryType") +]
 [+ == "Static" +]AC_DISABLE_SHARED
 [+ == "Shared" +]AC_DISABLE_STATIC
-[+ESAC+]AM_PROG_LIBTOOL
+[+ESAC+]LT_INIT
 
 [+IF (=(get "HavePackage") "1")+]
 PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+]])
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/minimal/configure.ac.tpl b/plugins/project-wizard/templates/minimal/configure.ac.tpl
index b111e5a..6e1b6cf 100644
--- a/plugins/project-wizard/templates/minimal/configure.ac.tpl
+++ b/plugins/project-wizard/templates/minimal/configure.ac.tpl
@@ -3,11 +3,13 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
+
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11 foreign])
 AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 
diff --git a/plugins/project-wizard/templates/pygtk/configure.ac.tpl b/plugins/project-wizard/templates/pygtk/configure.ac.tpl
index c3278fd..05f284f 100644
--- a/plugins/project-wizard/templates/pygtk/configure.ac.tpl
+++ b/plugins/project-wizard/templates/pygtk/configure.ac.tpl
@@ -4,21 +4,23 @@ dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
 AM_PATH_PYTHON
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
@@ -26,38 +28,7 @@ PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+] [+Packa
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/python/configure.ac.tpl b/plugins/project-wizard/templates/python/configure.ac.tpl
index e69a368..9a3ff7e 100644
--- a/plugins/project-wizard/templates/python/configure.ac.tpl
+++ b/plugins/project-wizard/templates/python/configure.ac.tpl
@@ -3,23 +3,26 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AM_PATH_PYTHON
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
@@ -27,38 +30,7 @@ PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+]])
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/sdl/configure.ac.tpl b/plugins/project-wizard/templates/sdl/configure.ac.tpl
index cda40a9..6d0e3fa 100644
--- a/plugins/project-wizard/templates/sdl/configure.ac.tpl
+++ b/plugins/project-wizard/templates/sdl/configure.ac.tpl
@@ -3,14 +3,16 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AC_CONFIG_HEADERS([config.h])
 
 SDL_REQUIRED=[+SDL_Version+]
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CC
 AC_PATH_XTRA
 
@@ -21,16 +23,17 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
-AM_PROG_LIBTOOL
+LT_INIT
 
 dnl ***************************************************************************
 dnl Check for SDL
diff --git a/plugins/project-wizard/templates/terminal/autogen.sh b/plugins/project-wizard/templates/terminal/autogen.sh
index a928a6b..12dc9d6 100755
--- a/plugins/project-wizard/templates/terminal/autogen.sh
+++ b/plugins/project-wizard/templates/terminal/autogen.sh
@@ -49,7 +49,7 @@ fi
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+(grep "^LT_INIT" $srcdir/configure.ac >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
@@ -129,7 +129,7 @@ do
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+      if grep "^LT_INIT" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
diff --git a/plugins/project-wizard/templates/terminal/configure.ac.tpl b/plugins/project-wizard/templates/terminal/configure.ac.tpl
index 9cc6efc..7a24a14 100644
--- a/plugins/project-wizard/templates/terminal/configure.ac.tpl
+++ b/plugins/project-wizard/templates/terminal/configure.ac.tpl
@@ -3,12 +3,14 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CC
 
 [+IF (=(get "HaveLangCPP") "1")+]
@@ -18,17 +20,19 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
@@ -36,38 +40,7 @@ PKG_CHECK_MODULES([+NameCUpper+], [[+PackageModule1+] [+PackageModule2+]])
 [+ENDIF+]
 
 [+IF (=(get "HaveGtkDoc") "1")+]
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
-  AC_MSG_RESULT(yes)
-  GTKDOC=true
-else
-  AC_MSG_RESULT(no)
-  GTKDOC=false
-fi
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc,
-              [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]],
-	      enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 [+ENDIF+]
 
 AC_OUTPUT([
diff --git a/plugins/project-wizard/templates/vala-gtk/configure.ac.tpl b/plugins/project-wizard/templates/vala-gtk/configure.ac.tpl
index 20a6960..b86e73f 100644
--- a/plugins/project-wizard/templates/vala-gtk/configure.ac.tpl
+++ b/plugins/project-wizard/templates/vala-gtk/configure.ac.tpl
@@ -3,16 +3,18 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CC
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 dnl Check for vala
diff --git a/plugins/project-wizard/templates/wxwin/configure.ac.tpl b/plugins/project-wizard/templates/wxwin/configure.ac.tpl
index 4336f55..2bb30e0 100644
--- a/plugins/project-wizard/templates/wxwin/configure.ac.tpl
+++ b/plugins/project-wizard/templates/wxwin/configure.ac.tpl
@@ -3,12 +3,14 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CC
 
 WXCONFIG=wx-config
@@ -42,17 +44,18 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]
diff --git a/plugins/project-wizard/templates/xlib/configure.ac.tpl b/plugins/project-wizard/templates/xlib/configure.ac.tpl
index 7a36221..50b1e14 100644
--- a/plugins/project-wizard/templates/xlib/configure.ac.tpl
+++ b/plugins/project-wizard/templates/xlib/configure.ac.tpl
@@ -3,12 +3,14 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
 AC_INIT([+NameHLower+], [+Version+])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11])
 AM_MAINTAINER_MODE
 
+AM_SILENT_RULES([yes])
+
 AC_PROG_CC
 AC_PATH_XTRA
 
@@ -19,17 +21,18 @@ AC_PROG_CXX
 
 [+IF (=(get "HaveI18n") "1")+]
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
+IT_PROG_INTLTOOL([0.35.0])
+
 GETTEXT_PACKAGE=[+NameHLower+]
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
 [+ENDIF+]
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]