require python to be explicitly disabled

diff --git a/CHANGES b/CHANGES
index 1ac0cbc8bc10404a91a2d0e33b163d08eb16a918..67ba29ca593fb3d2af2832919e6f2574e4f99a0e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+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]
 

diff --git a/configure b/configure
index a42f016212c51498d85b92d2cbbc411b8df5eeac..6ed2702470af5377edcd89693ebfe0dcd073182c 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
                        ;;
                *)

diff --git a/configure.ac b/configure.ac
index a1be2884862d72d78909e148868815a59d705d07..941053b8a56762d085e39efc4709615dc3636087 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
                        ;;
                *)