Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
bf874612
Commit
bf874612
authored
Nov 06, 2018
by
Mark Andrews
Browse files
require python to be explicitly disabled
parent
2bef7291
Pipeline
#6174
passed with stages
in 8 minutes and 6 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
bf874612
5078. [cleanup] Require python components to be explicitly disabled if
python is not available on unix platforms. [GL #601]
5077. [cleanup] Remove ip6.int support (-i) from dig and mdig.
[GL !969]
...
...
configure
View file @
bf874612
...
...
@@ -12140,7 +12140,7 @@ done
if test "${with_python+set}" = set; then :
withval=$with_python; use_python="$withval"
else
use_python="
unspec
"
use_python="
yes
"
fi
...
...
@@ -12174,9 +12174,9 @@ $as_echo_n "checking for python support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
$as_echo "disabled" >&6; }
;;
unspec|
yes|*)
yes|*)
case "$use_python" in
unspec|
yes|'')
yes|'')
for p in $python
do
for ac_prog in $p
...
...
@@ -12278,30 +12278,16 @@ $as_echo "not found" >&6; }
unset PYTHON
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5
$as_echo_n "checking for python support... " >&6; }
if test "X$PYTHON" != "X"
then
case "$use_python_install_dir" in
unspec)
PYTHON_INSTALL_DIR=""
PYTHON_INSTALL_LIB=""
;;
*)
PYTHON_INSTALL_DIR="$use_python_install_dir"
PYTHON_INSTALL_LIB="--install-lib=$use_python_install_dir"
;;
esac
PYTHON_INSTALL_DIR="$use_python_install_dir"
PYTHON_INSTALL_LIB="--install-lib=$use_python_install_dir"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5
$as_echo_n "checking for python support... " >&6; }
case "$use_python" in
unspec)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
$as_echo "disabled" >&6; }
;;
yes)
as_fn_error $? "missing python" "$LINENO" 5
;;
esac
as_fn_error $? "no; python required for dnssec-keymgr" "$LINENO" 5
fi
;;
*)
...
...
configure.ac
View file @
bf874612
...
...
@@ -184,7 +184,7 @@ AC_SUBST(PERL)
AC_ARG_WITH(python,
AS_HELP_STRING([--with-python=PATH],
[specify path to python interpreter]),
use_python="$withval", use_python="
unspec
")
use_python="$withval", use_python="
yes
")
AC_ARG_WITH(python-install-dir,
AS_HELP_STRING([--with-python-install-dir=PATH],
[installation directory for Python modules]),
...
...
@@ -208,11 +208,11 @@ if (sys.version_info < (2,7)) or (sys.version_info < (3,2) and sys.version_info
case "$use_python" in
no)
AC_MSG_CHECKING([for python support])
AC_MSG_RESULT(disabled)
AC_MSG_RESULT(
[
disabled
]
)
;;
unspec|
yes|*)
yes|*)
case "$use_python" in
unspec|
yes|'')
yes|'')
for p in $python
do
AC_PATH_PROGS(PYTHON, $p)
...
...
@@ -258,28 +258,14 @@ case "$use_python" in
unset PYTHON
fi
done
AC_MSG_CHECKING([for python support])
if test "X$PYTHON" != "X"
then
case "$use_python_install_dir" in
unspec)
PYTHON_INSTALL_DIR=""
PYTHON_INSTALL_LIB=""
;;
*)
PYTHON_INSTALL_DIR="$use_python_install_dir"
PYTHON_INSTALL_LIB="--install-lib=$use_python_install_dir"
;;
esac
PYTHON_INSTALL_DIR="$use_python_install_dir"
PYTHON_INSTALL_LIB="--install-lib=$use_python_install_dir"
AC_MSG_RESULT([yes])
else
AC_MSG_CHECKING([for python support])
case "$use_python" in
unspec)
AC_MSG_RESULT(disabled)
;;
yes)
AC_MSG_ERROR([missing python])
;;
esac
AC_MSG_ERROR([no; python required for dnssec-keymgr])
fi
;;
*)
...
...
Mark Andrews
@marka
mentioned in commit
7e32115c
·
Nov 06, 2018
mentioned in commit
7e32115c
mentioned in commit 7e32115c12d07cbab4c31acef84927ccf119c398
Toggle commit list
Mark Andrews
@marka
mentioned in commit
0768f54f
·
Nov 06, 2018
mentioned in commit
0768f54f
mentioned in commit 0768f54fd2339c751097260c2d65b36e31418b7f
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment