diff options
| author | Karel Zak | 2013-09-26 13:15:10 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-26 13:15:10 +0200 |
| commit | 3745d4a94d23edb22f4792d8c2cb2064e1116834 (patch) | |
| tree | 05eaef8ee51c6385d68343e9a0b324eef774c858 /configure.ac | |
| parent | build-sys: install to the correct python dirs (diff) | |
| download | kernel-qcow2-util-linux-3745d4a94d23edb22f4792d8c2cb2064e1116834.tar.gz kernel-qcow2-util-linux-3745d4a94d23edb22f4792d8c2cb2064e1116834.tar.xz kernel-qcow2-util-linux-3745d4a94d23edb22f4792d8c2cb2064e1116834.zip | |
build-sys: fix ${prefix} usage, be more verbose about py paths
- incorrect ${prefix} and ${exec_prefix} usage in AC_CASE
(bug introduced by commit 9f57e6e8)
- disable python by default (you have to use --with-python)
- add python paths to the finale ./configure info message
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 18664b977..22e00448d 100644 --- a/configure.ac +++ b/configure.ac @@ -50,14 +50,14 @@ LIBMOUNT_VERSION_INFO=`expr $LIBMOUNT_LT_MAJOR + $LIBMOUNT_LT_MINOR`:$LIBMOUNT_L AS_CASE([$exec_prefix:$prefix], [NONE:NONE | NONE:/usr | /usr:*], [AC_MSG_NOTICE([Default --exec-prefix detected.]) - AS_CASE([$bindir], [${exec_prefix}/bin], [bindir=/bin; AC_MSG_NOTICE([ --bindir defaults to /bin]) ]) - AS_CASE([$sbindir], [${exec_prefix}/sbin], [bindir=/sbin; AC_MSG_NOTICE([ --sbindir defaults to /sbin])]) - AS_CASE([$libdir], [${exec_prefix}/lib], [bindir=/lib; AC_MSG_NOTICE([ --libdir defaults to /lib]) ]) + AS_CASE([$bindir], ['${exec_prefix}/bin'], [bindir=/bin; AC_MSG_NOTICE([ --bindir defaults to /bin]) ]) + AS_CASE([$sbindir], ['${exec_prefix}/sbin'], [bindir=/sbin; AC_MSG_NOTICE([ --sbindir defaults to /sbin])]) + AS_CASE([$libdir], ['${exec_prefix}/lib'], [bindir=/lib; AC_MSG_NOTICE([ --libdir defaults to /lib]) ]) ] ) AS_CASE([$prefix:$localstatedir], - [NONE:${prefix}/var | /usr:${prefix}/var], + [NONE:'${prefix}/var' | /usr:'${prefix}/var'], [localstatedir=/run AC_MSG_NOTICE([ --localstatedir defaults to /run]) ] @@ -73,7 +73,7 @@ usrsbin_execdir='${exec_prefix}/sbin' AC_SUBST([usrsbin_execdir]) AS_CASE([$libdir], - [${exec_prefix}/* | ${prefix}/* | /usr/*], + ['${exec_prefix}/'* | '${prefix}/'* | /usr/*], [usrlib_execdir=$libdir], [usrlib_execdir='${exec_prefix}'$libdir] ) @@ -675,6 +675,7 @@ AS_IF([test "x$enable_most_builds" = xyes], [ enable_tunelp=yes enable_vipw=yes enable_write=yes + with_python=yes ]) dnl @@ -1374,8 +1375,8 @@ AM_CONDITIONAL([BUILD_BASH_COMPLETION], [test "x$enable_bash_completion" = xyes] AC_ARG_WITH([python], - AS_HELP_STRING([--without-python], [do not generate python bindings, use --with-python={2,3} to force version]), - [], [with_python=check] + AS_HELP_STRING([--with-python], [generate python bindings, use --with-python={2,3} to force version]), + [], [with_python=no] ) have_python=no @@ -1539,6 +1540,9 @@ AC_MSG_RESULT([ suid ldflags: ${SUID_LDFLAGS} Python: ${PYTHON_VERSION} + Python scripts: ${pythondir} + Python libs: ${pyexecdir} + Bash completions: ${with_bashcompletiondir} warnings: |