Correcting check for libtool

thopiekar · thopiekar · commit ede329815116 · 2015-09-01T21:05:56.000+02:00
It is correct that we need libtool, but the executable is called libtoolize. Therefore sh.which(executable) won't work in this case. I renamed the variable "tool" to "executable", so other developers won't get confused and also add package names here.
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -859,11 +859,11 @@ def prepare_build_environment(self, user_sdk_dir, user_ndk_dir,
 
         # AND: Are these necessary? Where to check for and and ndk-build?
         # check the basic tools
-        for tool in ("pkg-config", "autoconf", "automake", "libtool",
+        for executable in ("pkg-config", "autoconf", "automake", "libtoolize",
                      "tar", "bzip2", "unzip", "make", "gcc", "g++"):
-            if not sh.which(tool):
-                warning("Missing requirement: {} is not installed".format(
-                    tool))
+            if not sh.which(executable):
+                warning("Missing executable: {} is not installed".format(
+                    executable))
 
         if not ok:
             sys.exit(1)
