X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=fb2b0136f0dd0d5b0345783e26778e26383f5ea7;hp=20d0680098d425cc75b29daa613b81894b3b501f;hb=4f0b90ee4fe269c4a791cf6dd8bf8c05b779cc63;hpb=61fa50287dfbd4556b9049145700bcfd68facca2

diff --git a/configure.ac b/configure.ac
index 20d068009..fb2b0136f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,7 +394,7 @@ AC_ARG_WITH(kmod-prefix,
 
 AC_ARG_ENABLE(kmod,
 	AS_HELP_STRING([--disable-kmod],[build without kmod support]),
-	kmod_support=zz$enableval, kmod_support=yes)
+	kmod_support=$enableval, kmod_support=yes)
 
 AS_IF([test "x$kmod_support" = "xyes"], [
 	AC_CHECK_LIB([kmod], [kmod_module_probe_insert_module],
@@ -483,11 +483,11 @@ swig_version=2.0.0
 AC_ARG_ENABLE([python-bindings],
               [AC_HELP_STRING([--enable-python-bindings],
                               [compile Python bindings])],
-              [enable_python_binding=yes], [enable_python_binding=no])
+              [enable_python_binding=$enableval], [enable_python_binding=no])
 
-AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes])
+AM_CONDITIONAL([PYTHON_BINDING], [test "x$enable_python_binding" = xyes])
 
-if test "x${enable_python_binding:-yes}" = xyes; then
+if test "x$enable_python_binding" = 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])
@@ -621,6 +621,8 @@ and installing the man pages.
 AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
+AC_DEFINE_UNQUOTED([MANPATH], ["`eval eval echo $mandir`"], [Path to man pages.])
+
 # Python agent test
 UST_PYTHON_AGENT="lttngust"
 
@@ -931,7 +933,7 @@ AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
 	doc/man/Makefile
-	doc/man/asciidoc.conf
+	doc/man/asciidoc-attrs.conf
 	include/Makefile
 	extras/Makefile
 	extras/bindings/Makefile
@@ -1002,6 +1004,7 @@ AC_CONFIG_FILES([
 	tests/regression/ust/getcpu-override/Makefile
 	tests/regression/ust/clock-override/Makefile
 	tests/regression/ust/type-declarations/Makefile
+	tests/regression/ust/rotation-destroy-flush/Makefile
 	tests/stress/Makefile
 	tests/unit/Makefile
 	tests/unit/ini_config/Makefile
@@ -1109,7 +1112,7 @@ test ! -z "$PYTHON3_AGENT" && value=1 || value=0
 PPRINT_PROP_BOOL([LTTng-UST Python3 agent tests], $value)
 
 #Python binding enabled/disabled
-test "x${enable_python_binding:-yes}" = xyes && value=1 || value=0
+test "x$enable_python_binding" = xyes && value=1 || value=0
 AS_ECHO
 PPRINT_SET_INDENT(0)
 PPRINT_PROP_BOOL([Python binding], $value, $PPRINT_COLOR_SUBTITLE)