diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-12-22 10:09:23 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-01-04 22:20:35 -0500 |
| commit | 2f4da3e6c298bc0ae6243cae47aedb01c50fa870 (patch) | |
| tree | a83c692516fdafd779efd64e743b6cb273eb7da1 /configure.ac | |
| parent | bbed6c0d4b54d9c4e510415770e091d79eee2e8e (diff) | |
systemd-analyze: use specified binary, add --version
Python binary used in the she-bang line in installed
scripts can be set with ./configure PYTHON_BINARY=...
Defaults to the same path as python used during compilation.
Adding --version makes systemd-analyze behave consistently with the
rest of installed programs.
The lines in ./configure output are reordered to keep all yes/no lines
separate. I think that this makes the output clearer.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index e6dffe6253..b8ee626aee 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,12 @@ AS_IF([test "x$with_python" != "xno"], [ AM_PATH_PYTHON(,, [:]) AS_IF([test "$PYTHON" != :], [have_python=yes]) ]) -AM_CONDITIONAL([HAVE_PYTHON], [test "$have_python" = "yes"]) +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=/usr/bin/python])]) +AC_ARG_VAR(PYTHON_BINARY, [Python binary used to launch installed scripts]) AS_IF([test "x$with_python" != "xno"], [ AC_PATH_PROG(PYTHON_CONFIG, python${PYTHON_VERSION}-config) @@ -803,9 +808,6 @@ AC_OUTPUT AC_MSG_RESULT([ $PACKAGE_NAME $VERSION - SysV compatibility: ${SYSTEM_SYSV_COMPAT} - SysV init scripts: ${SYSTEM_SYSVINIT_PATH} - SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} libcryptsetup: ${have_libcryptsetup} tcpwrap: ${have_tcpwrap} PAM: ${have_pam} @@ -831,12 +833,15 @@ AC_MSG_RESULT([ coredump: ${have_coredump} kmod: ${have_kmod} blkid: ${have_blkid} - firmware path: ${FIRMWARE_PATH} gudev: ${enable_gudev} gintrospection: ${enable_introspection} keymap: ${enable_keymap} Python: ${have_python} Python Headers: ${have_python_devel} + man pages: ${have_manpages} + gtk-doc: ${enable_gtk_doc} + Split /usr: ${enable_split_usr} + SysV compatibility: ${SYSTEM_SYSV_COMPAT} prefix: ${prefix} rootprefix: ${with_rootprefix} @@ -846,14 +851,16 @@ AC_MSG_RESULT([ include_prefix: ${INCLUDE_PREFIX} lib dir: ${libdir} rootlib dir: ${with_rootlibdir} + SysV init scripts: ${SYSTEM_SYSVINIT_PATH} + SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} + Build Python: ${PYTHON} + Installation Python: ${PYTHON_BINARY} + firmware path: ${FIRMWARE_PATH} PAM modules dir: ${with_pamlibdir} D-Bus policy dir: ${with_dbuspolicydir} D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir: ${with_dbussystemservicedir} D-Bus interfaces dir: ${with_dbusinterfacedir} - Split /usr: ${enable_split_usr} - man pages: ${have_manpages} - gtk-doc: ${enable_gtk_doc} Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP} |