aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@entel.upc.edu>2012-03-01 16:41:15 +0000
committerRoger Pau Monne <roger.pau@entel.upc.edu>2012-03-01 16:41:15 +0000
commit5c4a03aaa029df6a56fe5055cf49e1c0598b5016 (patch)
tree9bf63dddd6669cdbf97772e534c8d5cb6c732f71
parentca92c5098f0d841ef937c56f0a34a86a87cd6437 (diff)
downloadxen-5c4a03aaa029df6a56fe5055cf49e1c0598b5016.tar.gz
xen-5c4a03aaa029df6a56fe5055cf49e1c0598b5016.tar.bz2
xen-5c4a03aaa029df6a56fe5055cf49e1c0598b5016.zip
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 <roger.pau@entel.upc.edu> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rwxr-xr-xtools/configure14
-rw-r--r--tools/configure.ac2
-rw-r--r--tools/m4/python_xml.m410
3 files changed, 0 insertions, 26 deletions
diff --git a/tools/configure b/tools/configure
index 697149671f..39bf1f35a4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3843,8 +3843,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
@@ -6141,18 +6139,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])