From 5c4a03aaa029df6a56fe5055cf49e1c0598b5016 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 1 Mar 2012 16:41:15 +0000 Subject: [PATCH] build: autoconf: remove python xml check Remove the xml module check from autoconf and move it to xend init script (in a later patch), since it's a run time dependency. Signed-off-by: Roger Pau Monne Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/configure | 14 -------------- tools/configure.ac | 2 -- tools/m4/python_xml.m4 | 10 ---------- 3 files changed, 26 deletions(-) delete mode 100644 tools/m4/python_xml.m4 diff --git a/tools/configure b/tools/configure index 697149671f..39bf1f35a4 100755 --- a/tools/configure +++ b/tools/configure @@ -3840,8 +3840,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - @@ -6140,18 +6138,6 @@ $as_echo "no" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python xml.dom.minidom" >&5 -$as_echo_n "checking for python xml.dom.minidom... " >&6; } -`$PYTHON -c 'import xml.dom.minidom'` -if test "$?" != "0" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Unable to find xml.dom.minidom module" "$LINENO" 5 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python devel" >&5 $as_echo_n "checking for python devel... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 2ff89c2194..c4afe1cf77 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -26,7 +26,6 @@ AC_CANONICAL_HOST m4_include([m4/enable_feature.m4]) m4_include([m4/disable_feature.m4]) m4_include([m4/path_or_fail.m4]) -m4_include([m4/python_xml.m4]) m4_include([m4/python_version.m4]) m4_include([m4/python_devel.m4]) m4_include([m4/ocaml.m4]) @@ -95,7 +94,6 @@ AS_IF([test "x$pythontools" = "xy"], [ [AC_MSG_ERROR([PYTHON specified, but is not an absolute path])]) AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON]) AX_CHECK_PYTHON_VERSION([2], [3]) - AX_CHECK_PYTHON_XML() AX_CHECK_PYTHON_DEVEL() ]) AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) diff --git a/tools/m4/python_xml.m4 b/tools/m4/python_xml.m4 deleted file mode 100644 index efd4be3468..0000000000 --- a/tools/m4/python_xml.m4 +++ /dev/null @@ -1,10 +0,0 @@ -AC_DEFUN([AX_CHECK_PYTHON_XML], -[AC_MSG_CHECKING([for python xml.dom.minidom]) -`$PYTHON -c 'import xml.dom.minidom'` -if test "$?" != "0" -then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Unable to find xml.dom.minidom module]) -else - AC_MSG_RESULT([yes]) -fi]) -- 2.30.2