projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: python bindings: use stdlib distutils when setuptools is installed
[babeltrace.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b343a3c4c07c10a51d098efec1ac6cdc53f4cdc0..95483337b0b633a6bee32fd2b4ac2e0f5a0d060c 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-50,7
+50,7
@@
AC_CANONICAL_HOST
## Automake base setup ##
## ##
## Automake base setup ##
## ##
-AM_INIT_AUTOMAKE([1.1
2
foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
+AM_INIT_AUTOMAKE([1.1
3
foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
AM_MAINTAINER_MODE([enable])
# Enable silent rules by default
AM_MAINTAINER_MODE([enable])
# Enable silent rules by default
@@
-250,7
+250,7
@@
AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
# Always check for python, we will fail later if some features require it and
# it's unavailable.
# Always check for python, we will fail later if some features require it and
# it's unavailable.
-AM_PATH_PYTHON([3.
0
], [
+AM_PATH_PYTHON([3.
4
], [
AE_PATH_PYTHON_MODULES([PYTHON])
# pythondir is the path where extra modules are to be installed
AE_PATH_PYTHON_MODULES([PYTHON])
# pythondir is the path where extra modules are to be installed
@@
-448,6
+448,7
@@
AE_FEATURE([Werror],[Treat compiler warnings as errors.])
# When given, build with AddressSanitizer.
AE_FEATURE_DEFAULT_DISABLE
AE_FEATURE([asan],[Build with AddressSanitizer.])
# When given, build with AddressSanitizer.
AE_FEATURE_DEFAULT_DISABLE
AE_FEATURE([asan],[Build with AddressSanitizer.])
+AE_FEATURE([ubsan],[Build with UndefinedBehaviorSanitizer.])
## ##
## Check for conflicting features selection ##
## ##
## Check for conflicting features selection ##
@@
-534,6
+535,14
@@
AS_IF([test -n "$PYTHON_CONFIG"], [have_python_dev=yes], [have_python_dev=no])
AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = xyes])
AM_CONDITIONAL([HAVE_PYTHON_DEV], [test "x$have_python_dev" = xyes])
AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = xyes])
AM_CONDITIONAL([HAVE_PYTHON_DEV], [test "x$have_python_dev" = xyes])
+AS_IF([test "x$have_python" = xyes], [
+ AX_COMPARE_VERSION(["$PYTHON_VERSION"], [ge], ["3.12"], [
+ have_python_312_or_greater=yes
+ ])
+])
+
+AM_CONDITIONAL([HAVE_PYTHON_312_OR_GREATER], [test "x$have_python_312_or_greater" = xyes])
+
AS_IF([AE_IS_FEATURE_ENABLED([python-bindings]) || AE_IS_FEATURE_ENABLED([python-plugins])], [
AS_IF([test "x$have_python_dev" = xno], [
AC_MSG_ERROR([Cannot find a suitable python-config. You can override the python-config path with the PYTHON_CONFIG environment variable.])
AS_IF([AE_IS_FEATURE_ENABLED([python-bindings]) || AE_IS_FEATURE_ENABLED([python-plugins])], [
AS_IF([test "x$have_python_dev" = xno], [
AC_MSG_ERROR([Cannot find a suitable python-config. You can override the python-config path with the PYTHON_CONFIG environment variable.])
@@
-655,13
+664,19
@@
AE_IF_FEATURE_ENABLED([asan], [
ASAN_LDFLAGS="-fsanitize=address"
])
ASAN_LDFLAGS="-fsanitize=address"
])
-
+# If --enable-ubsan is used...
+AE_IF_FEATURE_ENABLED([ubsan], [
+ # ... add -fsanitize=undefined to the *FLAGS variables.
+ UBSAN_CFLAGS="-fsanitize=undefined"
+ UBSAN_CXXFLAGS="-fsanitize=undefined"
+ UBSAN_LDFLAGS="-fsanitize=undefined"
+])
# CFLAGS from libraries (the glib ones are needed for the following sizeof
# test).
# CFLAGS from libraries (the glib ones are needed for the following sizeof
# test).
-AM_CFLAGS="-fvisibility=hidden ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${ASAN_CFLAGS}"
-AM_CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${ASAN_CXXFLAGS}"
-AM_LDFLAGS="${ASAN_LDFLAGS}"
+AM_CFLAGS="-fvisibility=hidden ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${ASAN_CFLAGS}
${UBSAN_CFLAGS}
"
+AM_CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${ASAN_CXXFLAGS}
${UBSAN_CFLAGS}
"
+AM_LDFLAGS="${ASAN_LDFLAGS}
${UBSAN_CFLAGS}
"
# Check that the current size_t matches the size that glib thinks it should
# be. This catches problems on multi-arch where people try to do a 32-bit
# Check that the current size_t matches the size that glib thinks it should
# be. This catches problems on multi-arch where people try to do a 32-bit
@@
-855,6
+870,7
@@
AC_CONFIG_FILES([
tests/lib/Makefile
tests/lib/test-plugin-plugins/Makefile
tests/lib/conds/Makefile
tests/lib/Makefile
tests/lib/test-plugin-plugins/Makefile
tests/lib/conds/Makefile
+ tests/lib/utils/Makefile
tests/Makefile
tests/param-validation/Makefile
tests/plugins/Makefile
tests/Makefile
tests/param-validation/Makefile
tests/plugins/Makefile
This page took
0.024142 seconds
and
4
git commands to generate.