X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=6a079bca3ff8979fcc04e81e3079aed789696fe5;hp=152c3dd131a0aa7cf188f04bf39ca1f0f0cad230;hb=3e40ee67e45d41f30a3cb3e9c6cacb4f14bebc75;hpb=9d400ab1079a681c59e3c61ad8978573de6d883c diff --git a/configure.ac b/configure.ac index 152c3dd13..6a079bca3 100644 --- a/configure.ac +++ b/configure.ac @@ -415,6 +415,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) if test "x${enable_python_binding:-yes}" = xyes; then AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ]) + AS_IF([test x$enable_shared = xno], [ AC_MSG_ERROR([Python bindings require shared libraries.]) ]) AM_PATH_PYTHON([3.0]) AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config]) @@ -499,18 +500,18 @@ AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) AC_ARG_ENABLE( build-man-pages, AS_HELP_STRING( - [--enable-build-man-pages], + [--disable-build-man-pages], [Build man pages (already built in a distributed tarball)] ), - [enable_build_man_pages=yes], - [enable_build_man_pages=no] + [build_man_pages=$enableval], + [build_man_pages=yes] ) # export man page build condition -AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$enable_build_man_pages" != "xno"]) +AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$build_man_pages" != "xno"]) # check for asciidoc and xmlto if we enabled building the man pages -AS_IF([test "x$enable_build_man_pages" = "xyes"], [ +AS_IF([test "x$build_man_pages" = "xyes"], [ AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) AC_PATH_PROG([XMLTO], [xmlto], [no]) @@ -994,8 +995,7 @@ AS_ECHO PPRINT_SUBTITLE([Man pages]) # man pages build enabled/disabled -test "x$enable_build_man_pages" = "xyes" && value=1 || value=0 -AS_IF([test "x$enable_build_man_pages" = "xyes"], [ +AS_IF([test "x$build_man_pages" = "xyes"], [ PPRINT_PROP_BOOL([Build man pages], 1) ], [ AS_IF([test "x$in_git_repo" = "xyes"], [ @@ -1006,7 +1006,7 @@ AS_IF([test "x$enable_build_man_pages" = "xyes"], [ ]) # man pages install enabled/disabled (always true in tarball) -test "x$enable_build_man_pages" = "xno" && test "x$in_git_repo" = "xyes" && value=0 || value=1 +test "x$build_man_pages" != "xyes" && test "x$in_git_repo" = "xyes" && value=0 || value=1 PPRINT_PROP_BOOL([Install man pages], $value) report_bindir="`eval eval echo $bindir`"