Mercurial > gub

changeset 4455:8c55e9064d87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ForceAutogenMagic: fixes for libtool 1.5.2, 2.2.4. autodir subs fixes.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 22 Oct 2008 22:26:45 +0200
parents e136420ca82b
children ab1880655ffc
files gub/commands.py
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gub/commands.py	Wed Oct 22 21:47:11 2008 +0200
+++ b/gub/commands.py	Wed Oct 22 22:26:45 2008 +0200
@@ -282,11 +282,14 @@
         if not autodir:
             autodir = package.expand ('%(srcdir)s')
         if os.path.isdir (os.path.join (package.srcdir (), 'ltdl')):
-            self.system (package.expand ('rm -rf %(autodir)s/libltdl && cd %(autodir)s && libtoolize --install --copy --force --automake --ltdl',
+            # --install is mandatory for libtool-2.2.x, but breaks with libtool-1.5.2
+            libtoolize = 'libtoolize --copy --force --automake --ltdl'
+            self.system (package.expand ('rm -rf %(autodir)s/libltdl && (cd %(autodir)s && %(libtoolize)s --install || %(libtoolize)s)',
                                          locals ()), logger)
         else:
-            # fixme
-            self.system (package.expand ('cd %(autodir)s && libtoolize --install --copy --force --automake',
+            # --install is mandatory for libtool-2.2.x, but breaks with libtool-1.5.2
+            libtoolize = 'libtoolize --copy --force --automake'
+            self.system (package.expand ('cd %(autodir)s && (%(libtoolize)s --install || %(libtoolize)s)',
                                          locals ()), logger)
 
         if os.path.exists (os.path.join (autodir, 'bootstrap')):
@@ -294,7 +297,7 @@
         elif os.path.exists (os.path.join (autodir, 'bootstrap.sh')):
             self.system (package.expand ('cd %(autodir)s && ./bootstrap.sh', locals ()), logger)
         elif os.path.exists (os.path.join (autodir, 'autogen.sh')):
-            s = file (package.expand ('%(autodir)s/autogen.sh')).read ()
+            s = file (package.expand ('%(autodir)s/autogen.sh', locals ())).read ()
             noconfigure = ' --help'
             if s.find ('--noconfigure'):
                 noconfigure = ' --noconfigure' + noconfigure
@@ -308,11 +311,11 @@
             headcmd = ''
             for c in ('configure.in','configure.ac'):
                 try:
-                    str = open (package.expand ('%(autodir)s/' + c)).read ()
+                    str = open (package.expand ('%(autodir)s/' + c, locals ())).read ()
                     m = re.search ('A[CM]_CONFIG_HEADER', str)
                     str = 0   ## don't want to expand str
                     if m:
-                        headcmd = package.expand ('cd %(autodir)s && autoheader %(aclocal_opt)s', env=locals ())
+                        headcmd = package.expand ('cd %(autodir)s && autoheader %(aclocal_opt)s', locals ())
                         break
 
                 except IOError: