From 5ed40d939999ef7672f4067c651064f5eb2a71ec Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Fri, 3 Jan 2014 21:53:14 -0800 Subject: [PATCH] libapparmor: require libtoolize instead of libtool 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 Acked-by: John Johansen --- libraries/libapparmor/autogen.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/libapparmor/autogen.sh b/libraries/libapparmor/autogen.sh index 773ab7f02..27bcf8a23 100755 --- a/libraries/libapparmor/autogen.sh +++ b/libraries/libapparmor/autogen.sh @@ -1,6 +1,7 @@ #!/bin/sh DIE=0 +package=libapparmor (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo @@ -19,7 +20,7 @@ DIE=0 DIE=1 } -(libtool --version) < /dev/null > /dev/null 2>&1 || { +(libtoolize --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have libtool installed to compile $package." echo "Download the appropriate package for your system,"