projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test lttng-modules clock override plugin
[lttng-tools.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b0cc5f76d31858bec20b6c5242b35106192f6dfe..c9107e271e244d359da1c96713e2d0e8937e6490 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-14,6
+14,8
@@
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Enable silent rules if available (Introduced in AM 1.11)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+
# Checks for C compiler
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
# Checks for C compiler
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
@@
-415,6
+417,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]) ])
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])
AM_PATH_PYTHON([3.0])
AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
@@
-502,15
+505,15
@@
AC_ARG_ENABLE(
[--disable-build-man-pages],
[Build man pages (already built in a distributed tarball)]
),
[--disable-build-man-pages],
[Build man pages (already built in a distributed tarball)]
),
- [
enable_build_man_pages=no
],
- [
enable_
build_man_pages=yes]
+ [
build_man_pages=$enableval
],
+ [build_man_pages=yes]
)
# export man page build condition
)
# 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
# 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])
AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
AC_PATH_PROG([XMLTO], [xmlto], [no])
@@
-994,8
+997,7
@@
AS_ECHO
PPRINT_SUBTITLE([Man pages])
# man pages build enabled/disabled
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"], [
PPRINT_PROP_BOOL([Build man pages], 1)
], [
AS_IF([test "x$in_git_repo" = "xyes"], [
@@
-1006,7
+1008,7
@@
AS_IF([test "x$enable_build_man_pages" = "xyes"], [
])
# man pages install enabled/disabled (always true in tarball)
])
# 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`"
PPRINT_PROP_BOOL([Install man pages], $value)
report_bindir="`eval eval echo $bindir`"
This page took
0.02392 seconds
and
4
git commands to generate.