[jhbuild] Bug 700557 - autoreconf -i fails in cases of ltmain.sh mismatch

From: Emanuele Aina <emaaa src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild] Bug 700557 - autoreconf -i fails in cases of ltmain.sh mismatch
Date: Mon, 18 Nov 2013 11:41:31 +0000 (UTC)
commit b822e83372738e5150bf4d9626390f510ec958c8
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jun 7 09:30:39 2013 -0400

    Bug 700557 - autoreconf -i fails in cases of ltmain.sh mismatch
    
    Use autoreconf -fi to force replacement of ltmain.sh

 doc/C/index.docbook           |    2 +-
 doc/de/de.po                  |    2 +-
 doc/el/el.po                  |    4 ++--
 doc/es/es.po                  |    4 ++--
 doc/fr/fr.po                  |    4 ++--
 doc/ja/ja.po                  |    4 ++--
 doc/sl/sl.po                  |    2 +-
 doc/sv/sv.po                  |    2 +-
 jhbuild/modtypes/autotools.py |    2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/doc/C/index.docbook b/doc/C/index.docbook
index cfdbd6c..bfc0939 100644
--- a/doc/C/index.docbook
+++ b/doc/C/index.docbook
@@ -2760,7 +2760,7 @@ Optional packages: (JHBuild will build the missing packages)
           specifies the name of the autogen.sh script to run. The value
           <literal>autoreconf</literal> can be used if your module has no
           <command>autogen.sh</command> script equivalent. In that case, JHBuild
-          will run <command>autoreconf -i</command>, followed by the proper
+          will run <command>autoreconf -fi</command>, followed by the proper
           <command>configure</command>.
           <sgmltag class="attribute">skip-autogen</sgmltag> chooses whether or
           not to run autogen.sh, it is a boolean with an extra
diff --git a/doc/de/de.po b/doc/de/de.po
index c5cd929..348ad65 100644
--- a/doc/de/de.po
+++ b/doc/de/de.po
@@ -3724,7 +3724,7 @@ msgid ""
 "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the "
 "name of the autogen.sh script to run. The value <literal>autoreconf</literal> "
 "can be used if your module has no <command>autogen.sh</command> script "
-"equivalent. In that case, JHBuild will run <command>autoreconf -i</command>, "
+"equivalent. In that case, JHBuild will run <command>autoreconf -fi</command>, "
 "followed by the proper <command>configure</command>. <sgmltag class="
 "\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen."
 "sh, it is a boolean with an extra <literal>never</literal> value to tell "
diff --git a/doc/el/el.po b/doc/el/el.po
index ea47be8..c39ec0a 100644
--- a/doc/el/el.po
+++ b/doc/el/el.po
@@ -4547,7 +4547,7 @@ msgid ""
 "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies "
 "the name of the autogen.sh script to run. The value <literal>autoreconf</"
 "literal> can be used if your module has no <command>autogen.sh</command> "
-"script equivalent. In that case, JHBuild will run <command>autoreconf -i</"
+"script equivalent. In that case, JHBuild will run <command>autoreconf -fi</"
 "command>, followed by the proper <command>configure</command>. <sgmltag "
 "class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run "
 "autogen.sh, it is a boolean with an extra <literal>never</literal> value to "
@@ -4561,7 +4561,7 @@ msgstr ""
 "όνομα του σεναρίου autogen.sh που θα εκτελεστεί. Η τιμή "
 "<literal>autoreconf</literal> μπορεί να χρησιμοποιηθεί αν η ενότητά σας δεν "
 "έχει κανένα ισοδύναμο σενάριο <command>autogen.sh</command>. Σε αυτήν την "
-"περίπτωση, το JHBuild θα εκτελέσει <command>autoreconf -i</command>, "
+"περίπτωση, το JHBuild θα εκτελέσει <command>autoreconf -fi</command>, "
 "ακολουθούμενο από το κατάλληλο <command>configure</command>. Το <sgmltag "
 "class=\"attribute\">skip-autogen</sgmltag> επιλέγει αν θα εκτελέσει autogen.sh "
 "ή όχι, είναι μια τιμή Μπουλ με πρόσθετη τιμή <literal>never</literal> που "
diff --git a/doc/es/es.po b/doc/es/es.po
index ceb9568..bf71a78 100644
--- a/doc/es/es.po
+++ b/doc/es/es.po
@@ -4398,7 +4398,7 @@ msgid ""
 "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies "
 "the name of the autogen.sh script to run. The value <literal>autoreconf</"
 "literal> can be used if your module has no <command>autogen.sh</command> "
-"script equivalent. In that case, JHBuild will run <command>autoreconf -i</"
+"script equivalent. In that case, JHBuild will run <command>autoreconf -fi</"
 "command>, followed by the proper <command>configure</command>. <sgmltag "
 "class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run "
 "autogen.sh, it is a boolean with an extra <literal>never</literal> value to "
@@ -4412,7 +4412,7 @@ msgstr ""
 "nombre del script autogen.sh que ejecutar. Se puede usar el valor "
 "<literal>autoreconf</literal> si su módulo no tiene un script "
 "<command>autogen.sh</command> equivalente. En este caso, JHBuild ejecutará "
-"<command>autoreconf -i</command>, seguido del <command>configure</command> "
+"<command>autoreconf -fi</command>, seguido del <command>configure</command> "
 "apropiado. <sgmltag class=\"attribute\">skip-autogen</sgmltag> decide si se "
 "ejecuta autogen.sh o no, es un valor booleano con un valor <literal>never</"
 "literal> adicional para indicar a JHBuild que nunca omita la ejecución de "
diff --git a/doc/fr/fr.po b/doc/fr/fr.po
index e507ab6..dde91f2 100644
--- a/doc/fr/fr.po
+++ b/doc/fr/fr.po
@@ -4344,7 +4344,7 @@ msgid ""
 "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies "
 "the name of the autogen.sh script to run. The value <literal>autoreconf</"
 "literal> can be used if your module has no <command>autogen.sh</command> "
-"script equivalent. In that case, JHBuild will run <command>autoreconf -i</"
+"script equivalent. In that case, JHBuild will run <command>autoreconf -fi</"
 "command>, followed by the proper <command>configure</command>. <sgmltag "
 "class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run "
 "autogen.sh, it is a boolean with an extra <literal>never</literal> value to "
@@ -4356,7 +4356,7 @@ msgstr ""
 "du script autogen.sh à exécuter. La valeur <literal>autoreconf</literal> "
 "peut être utilisée si le module n'a pas d'équivalent du script "
 "<command>autogen.sh</command>. Dans ce cas, JHBuild exécutera "
-"<command>autoreconf -i</command>, suivi par la phase <command>configure</"
+"<command>autoreconf -fi</command>, suivi par la phase <command>configure</"
 "command>. L'attribut <sgmltag class=\"attribute\">skip-autogen</sgmltag> "
 "indique s'il faut exécuter autogen.sh, il s'agit d'une valeur booléenne "
 "admettant également la valeur <literal>never</literal> pour signifier à "
diff --git a/doc/ja/ja.po b/doc/ja/ja.po
index 51c4cc7..dd38d90 100644
--- a/doc/ja/ja.po
+++ b/doc/ja/ja.po
@@ -2607,8 +2607,8 @@ msgid "The <sgmltag class=\"attribute\">autogenargs</sgmltag> and <sgmltag class
 msgstr "<sgmltag class=\"attribute\">autogenargs</sgmltag>、<sgmltag 
class=\"attribute\">makeargs</sgmltag>、<sgmltag class=\"attribute\">makeinstallargs</sgmltag> 属性では、それぞれ 
<command>autogen.sh</command>、<command>make</command> および <command>make install</command> に引き渡す追加の引数を指定します。"
 
 #: C/index.docbook:2741(section/para)
-msgid "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the name of the autogen.sh 
script to run. The value <literal>autoreconf</literal> can be used if your module has no 
<command>autogen.sh</command> script equivalent. In that case, JHBuild will run <command>autoreconf 
-i</command>, followed by the proper <command>configure</command>. <sgmltag 
class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen.sh, it is a boolean with an 
extra <literal>never</literal> value to tell JHBuild to never skip running <command>autogen.sh</command>. 
<sgmltag class=\"attribute\">skip-install</sgmltag> is a boolean attribute specifying whether to skip 
<command>make install</command> command on the module. <sgmltag class=\"attribute\">makefile</sgmltag> 
specifies the filename of the makefile to use."
-msgstr "<sgmltag class=\"attribute\">autogen-sh</sgmltag> 属性は、実行する autogen.sh スクリプトの名前を指定します。値 
<literal>autoreconf</literal> は、モジュールに <command>autogen.sh</command> に相当するスクリプトがない場合に使用できます。その場合、JHBuild 
は、<command>autoreconf -i</command> を実行し、その後で適切な <command>configure</command> を実行します。<sgmltag 
class=\"attribute\">skip-autogen</sgmltag> は、autogen.sh を実行するかどうかを指定します。指定できるのはブール値、あるいは 
<literal>never</literal> で、never を指定した場合は、<command>autogen.sh</command> の実行をスキップしません。<sgmltag 
class=\"attribute\">skip-install</sgmltag> は、ブール値の属性で、該当のモジュールにたいして <command>make install</command> 
コマンドをスキップするかどうかを指定します。<sgmltag class=\"attr
 ibute\">makefile</sgmltag> は、使用する makefile のファイル名を指定します。"
+msgid "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the name of the autogen.sh 
script to run. The value <literal>autoreconf</literal> can be used if your module has no 
<command>autogen.sh</command> script equivalent. In that case, JHBuild will run <command>autoreconf 
-fi</command>, followed by the proper <command>configure</command>. <sgmltag 
class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen.sh, it is a boolean with an 
extra <literal>never</literal> value to tell JHBuild to never skip running <command>autogen.sh</command>. 
<sgmltag class=\"attribute\">skip-install</sgmltag> is a boolean attribute specifying whether to skip 
<command>make install</command> command on the module. <sgmltag class=\"attribute\">makefile</sgmltag> 
specifies the filename of the makefile to use."
+msgstr "<sgmltag class=\"attribute\">autogen-sh</sgmltag> 属性は、実行する autogen.sh スクリプトの名前を指定します。値 
<literal>autoreconf</literal> は、モジュールに <command>autogen.sh</command> に相当するスクリプトがない場合に使用できます。その場合、JHBuild 
は、<command>autoreconf -fi</command> を実行し、その後で適切な <command>configure</command> を実行します。<sgmltag 
class=\"attribute\">skip-autogen</sgmltag> は、autogen.sh を実行するかどうかを指定します。指定できるのはブール値、あるいは 
<literal>never</literal> で、never を指定した場合は、<command>autogen.sh</command> の実行をスキップしません。<sgmltag 
class=\"attribute\">skip-install</sgmltag> は、ブール値の属性で、該当のモジュールにたいして <command>make install</command> 
コマンドをスキップするかどうかを指定します。<sgmltag class=\"att
 ribute\">makefile</sgmltag> は、使用する makefile のファイル名を指定します。"
 
 #: C/index.docbook:2756(section/para)
 msgid "The <sgmltag class=\"attribute\">supports-non-srcdir-builds</sgmltag> attribute is used to mark 
modules that can't be cleanly built using a separate source directory."
diff --git a/doc/sl/sl.po b/doc/sl/sl.po
index c07ff41..aab626d 100644
--- a/doc/sl/sl.po
+++ b/doc/sl/sl.po
@@ -2508,7 +2508,7 @@ msgid "The <sgmltag class=\"attribute\">autogenargs</sgmltag> and <sgmltag class
 msgstr ""
 
 #: C/index.docbook:2686(section/para)
-msgid "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the name of the autogen.sh 
script to run. The value <literal>autoreconf</literal> can be used if your module has no 
<command>autogen.sh</command> script equivalent. In that case, JHBuild will run <command>autoreconf 
-i</command>, followed by the proper <command>configure</command>. <sgmltag 
class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen.sh, it is a boolean with an 
extra <literal>never</literal> value to tell JHBuild to never skip running <command>autogen.sh</command>. 
<sgmltag class=\"attribute\">makefile</sgmltag> specifies the filename of the makefile to use."
+msgid "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the name of the autogen.sh 
script to run. The value <literal>autoreconf</literal> can be used if your module has no 
<command>autogen.sh</command> script equivalent. In that case, JHBuild will run <command>autoreconf 
-fi</command>, followed by the proper <command>configure</command>. <sgmltag 
class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen.sh, it is a boolean with an 
extra <literal>never</literal> value to tell JHBuild to never skip running <command>autogen.sh</command>. 
<sgmltag class=\"attribute\">makefile</sgmltag> specifies the filename of the makefile to use."
 msgstr ""
 
 #: C/index.docbook:2699(section/para)
diff --git a/doc/sv/sv.po b/doc/sv/sv.po
index 6f8bfbf..be98b6d 100644
--- a/doc/sv/sv.po
+++ b/doc/sv/sv.po
@@ -2021,7 +2021,7 @@ msgid "The <sgmltag class=\"attribute\">autogenargs</sgmltag> and <sgmltag class
 msgstr ""
 
 #: C/jhbuild.xml:1974(para)
-msgid "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the name of the autogen.sh 
script to run. The value <literal>autoreconf</literal> can be used if your module has no 
<command>autogen.sh</command> script equivalent. In that case, JHBuild will run <command>autoreconf 
-i</command>, followed by the proper <command>configure</command>. <sgmltag 
class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen.sh. <sgmltag 
class=\"attribute\">makefile</sgmltag> specifies the filename of the makefile to use."
+msgid "The <sgmltag class=\"attribute\">autogen-sh</sgmltag> attribute specifies the name of the autogen.sh 
script to run. The value <literal>autoreconf</literal> can be used if your module has no 
<command>autogen.sh</command> script equivalent. In that case, JHBuild will run <command>autoreconf 
-fi</command>, followed by the proper <command>configure</command>. <sgmltag 
class=\"attribute\">skip-autogen</sgmltag> chooses whether or not to run autogen.sh. <sgmltag 
class=\"attribute\">makefile</sgmltag> specifies the filename of the makefile to use."
 msgstr ""
 
 #: C/jhbuild.xml:1987(para)
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index ed145ba..e8dbd3f 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -241,7 +241,7 @@ class AutogenModule(MakeModule, DownloadableModule):
             extra_env['ACLOCAL'] = ' '.join((
                 extra_env.get('ACLOCAL', os.environ.get('ACLOCAL', 'aclocal')),
                 extra_env.get('ACLOCAL_FLAGS', os.environ.get('ACLOCAL_FLAGS', ''))))
-            buildscript.execute(['autoreconf', '-i'], cwd=srcdir,
+            buildscript.execute(['autoreconf', '-fi'], cwd=srcdir,
                     extra_env=extra_env)
             os.chmod(os.path.join(srcdir, 'configure'), 0755)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]