summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorSlawek Figiel <slawek@isc.org>2023-06-27 17:28:11 +0200
committerSlawek Figiel <slawek@isc.org>2023-06-29 13:44:08 +0200
commit7e9c84467f6d3cb4b5cd1dcce999d4a20efd285c (patch)
tree66650c7de2b57c3f8115b08eb184a75e1b002846 /configure.ac
parent[#2901] Added Changelog for #2901 (diff)
downloadkea-7e9c84467f6d3cb4b5cd1dcce999d4a20efd285c.tar.xz
kea-7e9c84467f6d3cb4b5cd1dcce999d4a20efd285c.zip
[#2467] Remove the kea_connector2.py
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac24
1 files changed, 10 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index dbf64c2477..15b070cb1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1125,15 +1125,20 @@ fi
AM_CONDITIONAL([GENERATE_PARSER], [test x$enable_generate_parser != xno])
-# Kea-shell is written in python. It can work with python 2.7 or any 3.x.
-# It may likely work with earlier versions, but 2.7 was the oldest one we tested
-# it with. We require python only if kea-shell was enabled. It is disabled
-# by default to not introduce hard dependency on python.
+# Kea-shell is written in python. It can work with any 3.x.
+# We require python only if kea-shell was enabled. It is disabled by default to
+# not introduce hard dependency on python.
AC_ARG_ENABLE(shell,
[AS_HELP_STRING([--enable-shell],
[enable kea-shell, a text management client for Control Agent [default=no]])],
enable_shell=$enableval, enable_shell=no)
+if test "x$enable_shell" != "xno"; then
+ major=`echo $PYTHON_VERSION | cut -d '.' -f 1`
+ if test "x$major" != "x3"; then
+ AC_MSG_WARN("kea-shell does not support python2")
+ fi
+fi
AC_ARG_ENABLE(generate_docs,
[AS_HELP_STRING([--enable-generate-docs],
@@ -1219,16 +1224,7 @@ if test "x${CRYPTO_NAME}" = "xBotan" && test "x$BOTAN_BOOST" = "xyes"; then
fi
# Decide if the shell TLS test can work.
-### This will be simpler when Python 2 support will be dropped.
-ca_tls_test=no
-if test "x$enable_shell" != "xno"; then
- major=`echo $PYTHON_VERSION | cut -d '.' -f 1`
- if test "x$major" = "x3"; then
- ca_tls_test="$tls_support"
- else
- AC_MSG_WARN("python2 kea-shell does not support HTTPS")
- fi
-fi
+ca_tls_test="$tls_support"
AM_CONDITIONAL(CA_TLS_TEST, test x$ca_tls_test != xno)
AC_ARG_WITH([sphinx],