Merge lp:~ted/snapcraft/autoreconf into lp:~snappy-dev/snapcraft/core

[Ted Gould]

Fixes needed for some autotools builds

When working on the Ginac example, the build didn't do well without more fixes.

[Sergio Schvezov (sergiusens)]

Looks good, can you create bug, add it to milestone 0.4 and link to it?

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~ted/snapcraft/autoreconf into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/plugins/autotools.py:50:80: E501 line too long (93 > 79 characters)

[lp:~ted/snapcraft/autoreconf]

249. By Ted Gould on 2015-10-19

PEP8 Fixes

=== modified file 'snapcraft/plugins/autotools.py'
--- snapcraft/plugins/autotools.py	2015-10-09 17:43:20 +0000
+++ snapcraft/plugins/autotools.py	2015-10-19 16:01:14 +0000
@@ -41,11 +41,17 @@
             'autoconf',
             'automake',
             'autopoint',
+            'libtool',
         ])
 
     def build(self):
         if not os.path.exists(os.path.join(self.builddir, "configure")):
-            if not self.run(['env', 'NOCONFIGURE=1', './autogen.sh']):
-                return False
+            if os.path.exists(os.path.join(self.builddir, "autogen.sh")):
+                if not self.run(['env', 'NOCONFIGURE=1', './autogen.sh'],
+                                cwd=self.builddir):
+                    return False
+            else:
+                if not self.run(['autoreconf', '-i'], cwd=self.builddir):
+                    return False
         return self.run(['./configure', '--prefix='] +
                         self.options.configflags) and super().build()

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-10-16 20:03:36 +0000
+++ snapcraft/yaml.py	2015-10-19 16:01:14 +0000
@@ -243,6 +243,7 @@
             '{0}/usr/local/share/pkgconfig',
             '$PKG_CONFIG_PATH'
         ]).format(root, snapcraft.common.get_arch_triplet()))
+        env.append('PERL5LIB={0}/usr/share/perl5/'.format(root))
         return env
 
     def build_env_for_part(self, part):