New upstream version 2020.4
This commit is contained in:
commit
10a6e008df
129 files changed
+7441
-1244
No files matched your search
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for libostree 2020.3.
|
||||
# Generated by GNU Autoconf 2.69 for libostree 2020.4.
|
||||
#
|
||||
# Report bugs to <walters@verbum.org>.
|
||||
#
|
||||
@@ -590,8 +590,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='libostree'
|
||||
PACKAGE_TARNAME='libostree'
|
||||
PACKAGE_VERSION='2020.3'
|
||||
PACKAGE_STRING='libostree 2020.3'
|
||||
PACKAGE_VERSION='2020.4'
|
||||
PACKAGE_STRING='libostree 2020.4'
|
||||
PACKAGE_BUGREPORT='walters@verbum.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -719,6 +719,10 @@ GTKDOC_MKPDF
|
||||
GTKDOC_REBASE
|
||||
GTKDOC_CHECK_PATH
|
||||
GTKDOC_CHECK
|
||||
USE_LIBSODIUM_FALSE
|
||||
USE_LIBSODIUM_TRUE
|
||||
OT_DEP_LIBSODIUM_LIBS
|
||||
OT_DEP_LIBSODIUM_CFLAGS
|
||||
USE_GPGME_FALSE
|
||||
USE_GPGME_TRUE
|
||||
GPG_ERROR_CONFIG
|
||||
@@ -741,6 +745,8 @@ INTROSPECTION_GIRDIR
|
||||
INTROSPECTION_GENERATE
|
||||
INTROSPECTION_COMPILER
|
||||
INTROSPECTION_SCANNER
|
||||
_GI_EXP_LIBDIR
|
||||
_GI_EXP_DATADIR
|
||||
USE_CURL_OR_SOUP_FALSE
|
||||
USE_CURL_OR_SOUP_TRUE
|
||||
HAVE_LIBSOUP_CLIENT_CERTS_FALSE
|
||||
@@ -933,6 +939,7 @@ enable_trivial_httpd_cmdline
|
||||
enable_introspection
|
||||
with_gpgme
|
||||
with_gpgme_prefix
|
||||
with_ed25519_libsodium
|
||||
with_html_dir
|
||||
enable_gtk_doc
|
||||
enable_gtk_doc_html
|
||||
@@ -996,6 +1003,8 @@ OT_DEP_GPGME_CFLAGS
|
||||
OT_DEP_GPGME_LIBS
|
||||
OT_DEP_GPG_ERROR_CFLAGS
|
||||
OT_DEP_GPG_ERROR_LIBS
|
||||
OT_DEP_LIBSODIUM_CFLAGS
|
||||
OT_DEP_LIBSODIUM_LIBS
|
||||
GTKDOC_DEPS_CFLAGS
|
||||
GTKDOC_DEPS_LIBS
|
||||
OT_DEP_LIBARCHIVE_CFLAGS
|
||||
@@ -1552,7 +1561,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures libostree 2020.3 to adapt to many kinds of systems.
|
||||
\`configure' configures libostree 2020.4 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1622,7 +1631,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libostree 2020.3:";;
|
||||
short | recursive ) echo "Configuration of libostree 2020.4:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1651,8 +1660,8 @@ Optional Features:
|
||||
Enable always building tests during 'make all'
|
||||
--disable-otmpfile Disable use of O_TMPFILE [default=no]
|
||||
--enable-wrpseudo-compat
|
||||
Disable use syscall() and filesystem calls to for
|
||||
compatibility with wrpseudo [default=no]
|
||||
Disable use of syscall() in some cases for
|
||||
compatibility with pseudo [default=no]
|
||||
--disable-glibtest do not try to compile and run a test GLIB program
|
||||
--disable-http2 Disable use of http2 (default: no)
|
||||
--enable-libsoup-client-certs
|
||||
@@ -1690,6 +1699,8 @@ Optional Packages:
|
||||
--with-soup Use libsoup [default=yes]
|
||||
--with-gpgme Use gpgme [default=yes]
|
||||
--with-gpgme-prefix=PFX prefix where GPGME is installed (optional)
|
||||
--with-ed25519-libsodium
|
||||
Use libsodium for ed25519 [default=no]
|
||||
--with-html-dir=PATH path to installed docs
|
||||
--without-libarchive Do not use libarchive
|
||||
--without-selinux Do not use SELinux
|
||||
@@ -1782,6 +1793,10 @@ Some influential environment variables:
|
||||
C compiler flags for OT_DEP_GPG_ERROR, overriding pkg-config
|
||||
OT_DEP_GPG_ERROR_LIBS
|
||||
linker flags for OT_DEP_GPG_ERROR, overriding pkg-config
|
||||
OT_DEP_LIBSODIUM_CFLAGS
|
||||
C compiler flags for OT_DEP_LIBSODIUM, overriding pkg-config
|
||||
OT_DEP_LIBSODIUM_LIBS
|
||||
linker flags for OT_DEP_LIBSODIUM, overriding pkg-config
|
||||
GTKDOC_DEPS_CFLAGS
|
||||
C compiler flags for GTKDOC_DEPS, overriding pkg-config
|
||||
GTKDOC_DEPS_LIBS
|
||||
@@ -1881,7 +1896,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libostree configure 2020.3
|
||||
libostree configure 2020.4
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -2353,7 +2368,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by libostree $as_me 2020.3, which was
|
||||
It was created by libostree $as_me 2020.4, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -3221,7 +3236,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='libostree'
|
||||
VERSION='2020.3'
|
||||
VERSION='2020.4'
|
||||
|
||||
|
||||
# Some tools Automake needs.
|
||||
@@ -5955,9 +5970,9 @@ test -n "$YACC" || YACC="yacc"
|
||||
|
||||
YEAR_VERSION=2020
|
||||
|
||||
RELEASE_VERSION=3
|
||||
RELEASE_VERSION=4
|
||||
|
||||
PACKAGE_VERSION=2020.3
|
||||
PACKAGE_VERSION=2020.4
|
||||
|
||||
|
||||
if echo "$CFLAGS" | grep -q -E -e '-Werror($| )'; then :
|
||||
@@ -15477,20 +15492,77 @@ esac
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
|
||||
$as_echo "$found_introspection" >&6; }
|
||||
|
||||
|
||||
EXP_VAR=_GI_EXP_DATADIR
|
||||
FROM_VAR="$datadir"
|
||||
|
||||
prefix_save=$prefix
|
||||
exec_prefix_save=$exec_prefix
|
||||
|
||||
if test "x$prefix" = "xNONE"; then
|
||||
prefix="$ac_default_prefix"
|
||||
fi
|
||||
if test "x$exec_prefix" = "xNONE"; then
|
||||
exec_prefix=$prefix
|
||||
fi
|
||||
|
||||
full_var="$FROM_VAR"
|
||||
while true; do
|
||||
new_full_var="`eval echo $full_var`"
|
||||
if test "x$new_full_var" = "x$full_var"; then break; fi
|
||||
full_var=$new_full_var
|
||||
done
|
||||
|
||||
full_var=$new_full_var
|
||||
_GI_EXP_DATADIR="$full_var"
|
||||
|
||||
|
||||
prefix=$prefix_save
|
||||
exec_prefix=$exec_prefix_save
|
||||
|
||||
|
||||
EXP_VAR=_GI_EXP_LIBDIR
|
||||
FROM_VAR="$libdir"
|
||||
|
||||
prefix_save=$prefix
|
||||
exec_prefix_save=$exec_prefix
|
||||
|
||||
if test "x$prefix" = "xNONE"; then
|
||||
prefix="$ac_default_prefix"
|
||||
fi
|
||||
if test "x$exec_prefix" = "xNONE"; then
|
||||
exec_prefix=$prefix
|
||||
fi
|
||||
|
||||
full_var="$FROM_VAR"
|
||||
while true; do
|
||||
new_full_var="`eval echo $full_var`"
|
||||
if test "x$new_full_var" = "x$full_var"; then break; fi
|
||||
full_var=$new_full_var
|
||||
done
|
||||
|
||||
full_var=$new_full_var
|
||||
_GI_EXP_LIBDIR="$full_var"
|
||||
|
||||
|
||||
prefix=$prefix_save
|
||||
exec_prefix=$exec_prefix_save
|
||||
|
||||
|
||||
INTROSPECTION_SCANNER=
|
||||
INTROSPECTION_COMPILER=
|
||||
INTROSPECTION_GENERATE=
|
||||
INTROSPECTION_GIRDIR=
|
||||
INTROSPECTION_TYPELIBDIR=
|
||||
if test "x$found_introspection" = "xyes"; then
|
||||
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||||
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||||
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
||||
INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||||
INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||
INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||
INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=datadir="${_GI_EXP_DATADIR}" --variable=girdir gobject-introspection-1.0`
|
||||
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --define-variable=libdir="${_GI_EXP_LIBDIR}" --variable=typelibdir gobject-introspection-1.0)"
|
||||
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
||||
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
||||
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||||
INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||||
fi
|
||||
|
||||
|
||||
@@ -16076,6 +16148,111 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
LIBSODIUM_DEPENDENCY="1.0.14"
|
||||
|
||||
# Check whether --with-ed25519_libsodium was given.
|
||||
if test "${with_ed25519_libsodium+set}" = set; then :
|
||||
withval=$with_ed25519_libsodium;
|
||||
else
|
||||
with_ed25519_libsodium=no
|
||||
fi
|
||||
|
||||
if test x$with_ed25519_libsodium != xno; then :
|
||||
|
||||
|
||||
$as_echo "#define HAVE_LIBSODIUM 1" >>confdefs.h
|
||||
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_LIBSODIUM" >&5
|
||||
$as_echo_n "checking for OT_DEP_LIBSODIUM... " >&6; }
|
||||
|
||||
if test -n "$OT_DEP_LIBSODIUM_CFLAGS"; then
|
||||
pkg_cv_OT_DEP_LIBSODIUM_CFLAGS="$OT_DEP_LIBSODIUM_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= \$LIBSODIUM_DEPENDENCY\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "libsodium >= $LIBSODIUM_DEPENDENCY") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_OT_DEP_LIBSODIUM_CFLAGS=`$PKG_CONFIG --cflags "libsodium >= $LIBSODIUM_DEPENDENCY" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$OT_DEP_LIBSODIUM_LIBS"; then
|
||||
pkg_cv_OT_DEP_LIBSODIUM_LIBS="$OT_DEP_LIBSODIUM_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= \$LIBSODIUM_DEPENDENCY\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "libsodium >= $LIBSODIUM_DEPENDENCY") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_OT_DEP_LIBSODIUM_LIBS=`$PKG_CONFIG --libs "libsodium >= $LIBSODIUM_DEPENDENCY" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
OT_DEP_LIBSODIUM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsodium >= $LIBSODIUM_DEPENDENCY" 2>&1`
|
||||
else
|
||||
OT_DEP_LIBSODIUM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsodium >= $LIBSODIUM_DEPENDENCY" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$OT_DEP_LIBSODIUM_PKG_ERRORS" >&5
|
||||
|
||||
have_libsodium=no
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
have_libsodium=no
|
||||
else
|
||||
OT_DEP_LIBSODIUM_CFLAGS=$pkg_cv_OT_DEP_LIBSODIUM_CFLAGS
|
||||
OT_DEP_LIBSODIUM_LIBS=$pkg_cv_OT_DEP_LIBSODIUM_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
have_libsodium=yes
|
||||
fi
|
||||
if test x$have_libsodium = xno ; then :
|
||||
|
||||
as_fn_error $? "Need LIBSODIUM version $LIBSODIUM_DEPENDENCY or later" "$LINENO" 5
|
||||
|
||||
fi
|
||||
OSTREE_FEATURES="$OSTREE_FEATURES sign-ed25519"
|
||||
|
||||
else
|
||||
with_ed25519_libsodium=no
|
||||
fi
|
||||
if test "x$have_libsodium" = xyes; then
|
||||
USE_LIBSODIUM_TRUE=
|
||||
USE_LIBSODIUM_FALSE='#'
|
||||
else
|
||||
USE_LIBSODIUM_TRUE='#'
|
||||
USE_LIBSODIUM_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
|
||||
# What's in RHEL7.2.
|
||||
FUSE_DEPENDENCY="fuse >= 2.9.2"
|
||||
@@ -18339,6 +18516,10 @@ if test -z "${USE_GPGME_TRUE}" && test -z "${USE_GPGME_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_GPGME\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_LIBSODIUM_TRUE}" && test -z "${USE_LIBSODIUM_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_LIBSODIUM\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
|
||||
as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
@@ -18844,7 +19025,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by libostree $as_me 2020.3, which was
|
||||
This file was extended by libostree $as_me 2020.4, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -18910,7 +19091,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
libostree config.status 2020.3
|
||||
libostree config.status 2020.4
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
@@ -20616,6 +20797,7 @@ echo "
|
||||
cryptographic checksums: $with_crypto
|
||||
systemd: $with_libsystemd
|
||||
libmount: $with_libmount
|
||||
libsodium (ed25519 signatures): $with_ed25519_libsodium
|
||||
libarchive (parse tar files directly): $with_libarchive
|
||||
static deltas: yes (always enabled now)
|
||||
O_TMPFILE: $enable_otmpfile
|
||||
|
||||
Reference in new issue
Block a user