[systemd-commits] configure.ac

[Zbigniew Jędrzejewski-Szmek]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b86d11da802b8ff70784b611aacdaa2d148271b4
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Jan 5 13:15:50 2013 -0500

    build-sys: use full path to python in scripts
    
    Commit c4eb236a2c didn't take into account the situation when the user
    sets e.g. PYTHON=python3 (without the full path).  This value would
    then be used verbatim for PYTHON_BINARY and in she-bang lines in
    scripts, which is incorrect. To fix this, $PYTHON is passed through
    which, which expands the path.  If $PYTHON_BINARY is desired which is
    not installed on the build system, then PYTHON_BINARY must be set
    separately.

diff --git a/configure.ac b/configure.ac
index 535b71f..a8d4887 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ AS_IF([test "x$with_python" != "xno"], [
 AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
 AS_IF([test "x$PYTHON_BINARY" = "x"],
       [AS_IF([test "x$have_python" = "xyes"],
-             [PYTHON_BINARY="$PYTHON"],
+             [PYTHON_BINARY="`which "$PYTHON"`"],
              [PYTHON_BINARY=/usr/bin/python])])
 AC_ARG_VAR(PYTHON_BINARY, [Python binary used to launch installed scripts])