summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <iwj@xenproject.org>2021-02-09 17:05:54 +0000
committerIan Jackson <iwj@xenproject.org>2021-02-09 17:09:34 +0000
commit548ba7c85c6d80a671c2abb8681c29bc85c616f3 (patch)
tree52e050eeca52ea710cc28fd6de459b533cefed6e
parentf18309eb06efd1db5a2ab9903a1c246b6299951a (diff)
tools: Regenerate autoconf
This seems to have been omitted in many recent commits. The earliest of which are, according to git-bisect: 154137dfdba3 stubdom/configure stubdom: add xenstore pvh stubdom cc83ee4c6c37 all configure scripts NetBSD: Fix lock directory path but it seems that this is true of several later commits too. Release status: I consider this discrepancy a release critical bug. Signed-off-by: Ian Jackson <iwj@xenproject.org> Release-acked-by: Ian Jackson <iwj@xenproject.org>
-rwxr-xr-xconfigure2
-rwxr-xr-xdocs/configure7
-rwxr-xr-xstubdom/configure6
-rwxr-xr-xtools/configure2
4 files changed, 10 insertions, 7 deletions
diff --git a/configure b/configure
index 741e54bf2a..e174dbd238 100755
--- a/configure
+++ b/configure
@@ -2056,7 +2056,7 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
case "$host_os" in
*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
-*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
+*netbsd*) XEN_LOCK_DIR=$rundir_path ;;
*) XEN_LOCK_DIR=$localstatedir/lock ;;
esac
diff --git a/docs/configure b/docs/configure
index f55268564e..1582d477e3 100755
--- a/docs/configure
+++ b/docs/configure
@@ -1749,7 +1749,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_files="$ac_config_files ../config/Docs.mk man/xl.cfg.5.pod man/xl.1.pod"
+ac_config_files="$ac_config_files ../config/Docs.mk man/xl.cfg.5.pod man/xl.1.pod man/xl-disk-configuration.5.pod man/xl-network-configuration.5.pod man/xl.conf.5.pod"
ac_aux_dir=
for ac_dir in ../ "$srcdir"/../; do
@@ -1959,7 +1959,7 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
case "$host_os" in
*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
-*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
+*netbsd*) XEN_LOCK_DIR=$rundir_path ;;
*) XEN_LOCK_DIR=$localstatedir/lock ;;
esac
@@ -2976,6 +2976,9 @@ do
"../config/Docs.mk") CONFIG_FILES="$CONFIG_FILES ../config/Docs.mk" ;;
"man/xl.cfg.5.pod") CONFIG_FILES="$CONFIG_FILES man/xl.cfg.5.pod" ;;
"man/xl.1.pod") CONFIG_FILES="$CONFIG_FILES man/xl.1.pod" ;;
+ "man/xl-disk-configuration.5.pod") CONFIG_FILES="$CONFIG_FILES man/xl-disk-configuration.5.pod" ;;
+ "man/xl-network-configuration.5.pod") CONFIG_FILES="$CONFIG_FILES man/xl-network-configuration.5.pod" ;;
+ "man/xl.conf.5.pod") CONFIG_FILES="$CONFIG_FILES man/xl.conf.5.pod" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/stubdom/configure b/stubdom/configure
index 903414589b..6068f58d12 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -690,7 +690,7 @@ enable_c_stubdom
enable_caml_stubdom
enable_pv_grub
enable_xenstore_stubdom
-enable_xenstore_pvh_stubdom
+enable_xenstorepvh_stubdom
enable_vtpm_stubdom
enable_vtpmmgr_stubdom
enable_qemu_traditional
@@ -2184,8 +2184,8 @@ fi
# Check whether --enable-xenstorepvh-stubdom was given.
-if test "${enable_xenstore_pvh_stubdom+set}" = set; then :
- enableval=$enable_xenstore_pvh_stubdom;
+if test "${enable_xenstorepvh_stubdom+set}" = set; then :
+ enableval=$enable_xenstorepvh_stubdom;
if test "x$enableval" = "xyes"; then :
diff --git a/tools/configure b/tools/configure
index 42c0d05bc1..519efb71ee 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4038,7 +4038,7 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
case "$host_os" in
*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
-*netbsd*) XEN_LOCK_DIR=$localstatedir/run ;;
+*netbsd*) XEN_LOCK_DIR=$rundir_path ;;
*) XEN_LOCK_DIR=$localstatedir/lock ;;
esac