tools: drop stale references to curl/xml2-config

Curl and xml2 are not required anymore since 185bb58be3 ("tools: drop
libxen") removed their only user.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Wei Liu <wei.liu2@citrix.com>
[ wei: run autogen.sh ]

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 0f79f4e0c204f33f53e2fc6424001297d4064274..2d6c440324998959f7cfff44b1ba5607b9c52b5b 100644 (file)
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -12,8 +12,6 @@ PYTHON              := @PYTHON@
 PYTHON_PATH         := @PYTHONPATH@
 PY_NOOPT_CFLAGS     := @PY_NOOPT_CFLAGS@
 PERL                := @PERL@
-CURL_CONFIG         := @CURL@
-XML2_CONFIG         := @XML@
 BASH                := @BASH@
 XGETTTEXT           := @XGETTEXT@
 AS86                := @AS86@

diff --git a/tools/configure b/tools/configure
index feb34fc03df72414d998835035c2d431ebf7220c..00fce2637ecc39eb8d9398edeb30f487b34bbb71 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -684,8 +684,6 @@ AWK
 IASL
 XGETTEXT
 BASH
-XML
-CURL
 FLEX
 BISON
 PERL
@@ -834,8 +832,6 @@ PYTHON
 PERL
 BISON
 FLEX
-CURL
-XML
 BASH
 XGETTEXT
 AS86
@@ -1565,8 +1561,6 @@ Some influential environment variables:
   PERL        Path to Perl parser
   BISON       Path to Bison parser generator
   FLEX        Path to Flex lexical analyser generator
-  CURL        Path to curl-config tool
-  XML         Path to xml2-config tool
   BASH        Path to bash shell
   XGETTEXT    Path to xgetttext tool
   AS86        Path to as86 tool
@@ -4611,8 +4605,6 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
 
 
 
-
-
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

diff --git a/tools/configure.ac b/tools/configure.ac
index 06eb16db4fb3e648c5d2f1788b4d4544f7fc1fac..0826af8cbc406e8e95ede51e43c4be5003057831 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -266,8 +266,6 @@ AC_ARG_VAR([PYTHON], [Path to the Python parser])
 AC_ARG_VAR([PERL], [Path to Perl parser])
 AC_ARG_VAR([BISON], [Path to Bison parser generator])
 AC_ARG_VAR([FLEX], [Path to Flex lexical analyser generator])
-AC_ARG_VAR([CURL], [Path to curl-config tool])
-AC_ARG_VAR([XML], [Path to xml2-config tool])
 AC_ARG_VAR([BASH], [Path to bash shell])
 AC_ARG_VAR([XGETTEXT], [Path to xgetttext tool])
 AC_ARG_VAR([AS86], [Path to as86 tool])