mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libapparmor: require libtoolize instead of libtool

Browse source 
Merge from trunk revision 2295:

libtoolize is the standard mechanism for incorporating libtool support
into a library; however, libapparmor's autogen.sh script specifically
looks for the existence of the libtool binary rather than libtoolize.
The libtoolize tool automatically generates a libtool script and does
not require the existence of the libtool binary, so we no longer need
to check for it.

The autogen.sh script aborting because it can't find the libtool
binary causes a spurious build failure in Ubuntu 14.04, due to the
libtool binary being separated out into its own package, and which
is not a strict dependency for libtool.

(I also added setting the package variable so that the error message
emitted will indicate that the failure is in building libapparmor.)

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Steve Beattie 2014-01-03 21:53:14 -08:00
parent 6b18bb00ff
commit 5ed40d9399
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/libapparmor/autogen.sh
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
DIE=0 DIE=0
package=libapparmor
(autoconf --version) < /dev/null > /dev/null 2>&1 || { (autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo echo
@ -19,7 +20,7 @@ DIE=0
DIE=1 DIE=1
} }
(libtool --version) < /dev/null > /dev/null 2>&1 || { (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have libtool installed to compile $package." echo "You must have libtool installed to compile $package."
echo "Download the appropriate package for your system," echo "Download the appropriate package for your system,"