Mailing List Archive

commit 47ee23f05ac945e5fedf118b8e85af95c5da3276
Author: Demi Marie Obenour <demi@invisiblethingslab.com>
AuthorDate: Tue Mar 21 13:33:38 2023 -0400
Commit: Andrew Cooper <andrew.cooper3@citrix.com>
CommitDate: Fri Mar 24 16:29:15 2023 +0000

configure: Do not try to use broken links

The upstream URLs for zlib, PolarSSL, and the TPM emulator do not work
anymore, so do not attempt to use them.

Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
m4/stubdom.m4 | 5 +++--
stubdom/configure | 21 +++------------------
stubdom/configure.ac | 6 +++---
3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/m4/stubdom.m4 b/m4/stubdom.m4
index 6aa488b8e2..26f10595d1 100644
--- a/m4/stubdom.m4
+++ b/m4/stubdom.m4
@@ -78,10 +78,11 @@ done
AC_DEFUN([AX_STUBDOM_LIB], [
AC_ARG_VAR([$1_URL], [Download url for $2])
AS_IF([test "x$$1_URL" = "x"], [
- AS_IF([test "x$extfiles" = "xy"],
+ m4_if([$#],[3],[$1_URL=\@S|@\@{:@XEN_EXTFILES_URL\@:}@],
+ [$#],[4],[AS_IF([test "x$extfiles" = "xy"],
[$1_URL=\@S|@\@{:@XEN_EXTFILES_URL\@:}@],
[$1_URL="$4"])
- ])
+],[m4_fatal([AX_STUBDOM_LIB expects 3 or 4 arguments, not $#])])])
$1_VERSION="$3"
AC_SUBST($1_URL)
AC_SUBST($1_VERSION)
diff --git a/stubdom/configure b/stubdom/configure
index b8bffceafd..4ea95baa91 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -3532,12 +3532,7 @@ fi

if test "x$ZLIB_URL" = "x"; then :

- if test "x$extfiles" = "xy"; then :
- ZLIB_URL=\$\(XEN_EXTFILES_URL\)
-else
- ZLIB_URL="http://www.zlib.net"
-fi
-
+ ZLIB_URL=\$\(XEN_EXTFILES_URL\)
fi
ZLIB_VERSION="1.2.3"

@@ -3633,12 +3628,7 @@ GMP_VERSION="4.3.2"

if test "x$POLARSSL_URL" = "x"; then :

- if test "x$extfiles" = "xy"; then :
- POLARSSL_URL=\$\(XEN_EXTFILES_URL\)
-else
- POLARSSL_URL="http://polarssl.org/code/releases"
-fi
-
+ POLARSSL_URL=\$\(XEN_EXTFILES_URL\)
fi
POLARSSL_VERSION="1.1.4"

@@ -3648,12 +3638,7 @@ POLARSSL_VERSION="1.1.4"

if test "x$TPMEMU_URL" = "x"; then :

- if test "x$extfiles" = "xy"; then :
- TPMEMU_URL=\$\(XEN_EXTFILES_URL\)
-else
- TPMEMU_URL="http://download.berlios.de/tpm-emulator"
-fi
-
+ TPMEMU_URL=\$\(XEN_EXTFILES_URL\)
fi
TPMEMU_VERSION="0.7.4"

diff --git a/stubdom/configure.ac b/stubdom/configure.ac
index e20d99edac..c648b1602c 100644
--- a/stubdom/configure.ac
+++ b/stubdom/configure.ac
@@ -55,15 +55,15 @@ AC_PROG_INSTALL
AX_DEPENDS_PATH_PROG([vtpm], [CMAKE], [cmake])

# Stubdom libraries version and url setup
-AX_STUBDOM_LIB([ZLIB], [zlib], [1.2.3], [http://www.zlib.net])
+AX_STUBDOM_LIB([ZLIB], [zlib], [1.2.3])
AX_STUBDOM_LIB([LIBPCI], [libpci], [2.2.9], [http://www.kernel.org/pub/software/utils/pciutils])
AX_STUBDOM_LIB([NEWLIB], [newlib], [1.16.0], [ftp://sources.redhat.com/pub/newlib])
AX_STUBDOM_LIB([LWIP], [lwip], [1.3.0], [http://download.savannah.gnu.org/releases/lwip])
AX_STUBDOM_LIB([GRUB], [grub], [0.97], [http://alpha.gnu.org/gnu/grub])
AX_STUBDOM_LIB_NOEXT([OCAML], [ocaml], [4.02.0], [http://caml.inria.fr/pub/distrib/ocaml-4.02])
AX_STUBDOM_LIB([GMP], [libgmp], [4.3.2], [ftp://ftp.gmplib.org/pub/gmp-4.3.2])
-AX_STUBDOM_LIB([POLARSSL], [polarssl], [1.1.4], [http://polarssl.org/code/releases])
-AX_STUBDOM_LIB([TPMEMU], [berlios tpm emulator], [0.7.4], [http://download.berlios.de/tpm-emulator])
+AX_STUBDOM_LIB([POLARSSL], [polarssl], [1.1.4])
+AX_STUBDOM_LIB([TPMEMU], [berlios tpm emulator], [0.7.4])

#These stubdoms should be enabled if the dependent one is
AX_STUBDOM_AUTO_DEPENDS([vtpmmgr], [vtpm])
--
generated by git-patchbot for /home/xen/git/xen.git#master