[anjuta] project-wizard: Fix bug preventing projects with libtool to regenerate



commit c874e019d6dc299ef1c9ef088b35f68b15e17b2c
Author: Arnel A. Borja <galeon ymail com>
Date:   Tue Aug 30 11:45:10 2011 +0800

    project-wizard: Fix bug preventing projects with libtool to regenerate
    
    - configure.ac: Replace AM_PROG_LIBTOOL with LT_INIT.
    - configure.ac: Remove parameters in AM_INIT_AUTOMAKE, since this form is
      deprecated.
    - autogen.sh: Check for LT_INIT instead of AM_PROG_LIBTOOL.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657590

 .../project-wizard/templates/minimal/autogen.sh    |    4 ++--
 .../templates/minimal/configure.ac.tpl             |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/project-wizard/templates/minimal/autogen.sh b/plugins/project-wizard/templates/minimal/autogen.sh
index 957e18f..11825eb 100755
--- a/plugins/project-wizard/templates/minimal/autogen.sh
+++ b/plugins/project-wizard/templates/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/minimal/configure.ac.tpl b/plugins/project-wizard/templates/minimal/configure.ac.tpl
index 03794f1..b111e5a 100644
--- a/plugins/project-wizard/templates/minimal/configure.ac.tpl
+++ b/plugins/project-wizard/templates/minimal/configure.ac.tpl
@@ -3,11 +3,11 @@ 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
 AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PROG_CC
 
@@ -17,7 +17,7 @@ AC_PROG_CXX
 [+ENDIF+]
 
 [+IF (=(get "HaveSharedlib") "1")+]
-AM_PROG_LIBTOOL
+LT_INIT
 [+ENDIF+]
 
 [+IF (=(get "HavePackage") "1")+]



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]