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.) This patch is for trunk and 2.8. Signed-off-by: Steve Beattie <[email protected]> --- libraries/libapparmor/autogen.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: b/libraries/libapparmor/autogen.sh =================================================================== --- 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," -- Steve Beattie <[email protected]> http://NxNW.org/~steve/
signature.asc
Description: Digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
