New upstream version 2019.3

This commit is contained in:
Simon McVittie committed 2019-08-23 08:37:51 +01:00
commit 1b51e1d9d0
129 files changed
+3815 -1046

No files matched your search

Vendored
+63 -25
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libostree 2019.2.
# Generated by GNU Autoconf 2.69 for libostree 2019.3.
#
# Report bugs to <walters@verbum.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libostree'
PACKAGE_TARNAME='libostree'
PACKAGE_VERSION='2019.2'
PACKAGE_STRING='libostree 2019.2'
PACKAGE_VERSION='2019.3'
PACKAGE_STRING='libostree 2019.3'
PACKAGE_BUGREPORT='walters@verbum.org'
PACKAGE_URL=''
@@ -721,6 +721,8 @@ GTKDOC_MKPDF
GTKDOC_REBASE
GTKDOC_CHECK_PATH
GTKDOC_CHECK
USE_GPGME_FALSE
USE_GPGME_TRUE
GPG_ERROR_CONFIG
OT_DEP_GPG_ERROR_LIBS
OT_DEP_GPG_ERROR_CFLAGS
@@ -933,6 +935,7 @@ with_soup
enable_libsoup_client_certs
enable_trivial_httpd_cmdline
enable_introspection
with_gpgme
with_gpgme_prefix
with_html_dir
enable_gtk_doc
@@ -1553,7 +1556,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 2019.2 to adapt to many kinds of systems.
\`configure' configures libostree 2019.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1623,7 +1626,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libostree 2019.2:";;
short | recursive ) echo "Configuration of libostree 2019.3:";;
esac
cat <<\_ACEOF
@@ -1689,6 +1692,7 @@ Optional Packages:
compiler's sysroot if not specified).
--with-curl Use libcurl [default=no]
--with-soup Use libsoup [default=yes]
--with-gpgme Use gpgme [default=yes]
--with-gpgme-prefix=PFX prefix where GPGME is installed (optional)
--with-html-dir=PATH path to installed docs
--without-libarchive Do not use libarchive
@@ -1881,7 +1885,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libostree configure 2019.2
libostree configure 2019.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2353,7 +2357,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 2019.2, which was
It was created by libostree $as_me 2019.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3221,7 +3225,7 @@ fi
# Define the identity of the package.
PACKAGE='libostree'
VERSION='2019.2'
VERSION='2019.3'
# Some tools Automake needs.
@@ -5955,9 +5959,9 @@ test -n "$YACC" || YACC="yacc"
YEAR_VERSION=2019
RELEASE_VERSION=2
RELEASE_VERSION=3
PACKAGE_VERSION=2019.2
PACKAGE_VERSION=2019.3
if echo "$CFLAGS" | grep -q -E -e '-Werror($| )'; then :
@@ -15531,6 +15535,13 @@ fi
LIBGPGME_DEPENDENCY="1.1.8"
# Check whether --with-gpgme was given.
if test "${with_gpgme+set}" = set; then :
withval=$with_gpgme;
else
with_gpgme=yes
fi
# Check whether --with-gpgme-prefix was given.
if test "${with_gpgme_prefix+set}" = set; then :
@@ -15611,6 +15622,8 @@ fi
gpgme_version_micro=`echo $gpgme_version | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
if test x$with_gpgme != xno; then :
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_GPGME" >&5
@@ -15672,7 +15685,7 @@ fi
tmp=$LIBGPGME_DEPENDENCY
tmp=$LIBGPGME_DEPENDENCY
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
@@ -15768,7 +15781,7 @@ elif test $pkg_failed = untried; then
$as_echo "no" >&6; }
tmp=$LIBGPGME_DEPENDENCY
tmp=$LIBGPGME_DEPENDENCY
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
@@ -15866,12 +15879,12 @@ else
$as_echo "yes" >&6; }
have_gpgme=yes
fi
if test x$have_gpgme = xno ; then :
if test x$have_gpgme = xno ; then :
as_fn_error $? "Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later" "$LINENO" 5
as_fn_error $? "Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later" "$LINENO" 5
fi
OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_GPG_ERROR" >&5
@@ -15932,7 +15945,7 @@ fi
echo "$OT_DEP_GPG_ERROR_PKG_ERRORS" >&5
# Extract the first word of "gpg-error-config", so it can be a program name with args.
# Extract the first word of "gpg-error-config", so it can be a program name with args.
set dummy gpg-error-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -15973,14 +15986,14 @@ $as_echo "no" >&6; }
fi
OT_DEP_GPG_ERROR_CFLAGS="$( $GPG_ERROR_CONFIG --cflags )"
OT_DEP_GPG_ERROR_LIBS="$( $GPG_ERROR_CONFIG --libs )"
OT_DEP_GPG_ERROR_CFLAGS="$( $GPG_ERROR_CONFIG --cflags )"
OT_DEP_GPG_ERROR_LIBS="$( $GPG_ERROR_CONFIG --libs )"
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
# Extract the first word of "gpg-error-config", so it can be a program name with args.
# Extract the first word of "gpg-error-config", so it can be a program name with args.
set dummy gpg-error-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -16021,8 +16034,8 @@ $as_echo "no" >&6; }
fi
OT_DEP_GPG_ERROR_CFLAGS="$( $GPG_ERROR_CONFIG --cflags )"
OT_DEP_GPG_ERROR_LIBS="$( $GPG_ERROR_CONFIG --libs )"
OT_DEP_GPG_ERROR_CFLAGS="$( $GPG_ERROR_CONFIG --cflags )"
OT_DEP_GPG_ERROR_LIBS="$( $GPG_ERROR_CONFIG --libs )"
else
OT_DEP_GPG_ERROR_CFLAGS=$pkg_cv_OT_DEP_GPG_ERROR_CFLAGS
@@ -16031,8 +16044,26 @@ else
$as_echo "yes" >&6; }
fi
OT_DEP_GPGME_CFLAGS="${OT_DEP_GPGME_CFLAGS} ${OT_DEP_GPG_ERROR_CFLAGS}"
OT_DEP_GPGME_LIBS="${OT_DEP_GPGME_LIBS} ${OT_DEP_GPG_ERROR_LIBS}"
OT_DEP_GPGME_CFLAGS="${OT_DEP_GPGME_CFLAGS} ${OT_DEP_GPG_ERROR_CFLAGS}"
OT_DEP_GPGME_LIBS="${OT_DEP_GPGME_LIBS} ${OT_DEP_GPG_ERROR_LIBS}"
else
$as_echo "#define OSTREE_DISABLE_GPGME 1" >>confdefs.h
with_gpgme=no
fi
if test "x$have_gpgme" = xyes; then
USE_GPGME_TRUE=
USE_GPGME_FALSE='#'
else
USE_GPGME_TRUE='#'
USE_GPGME_FALSE=
fi
LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
# What's in RHEL7.2.
@@ -18095,6 +18126,9 @@ OSTREE_FEATURES="$OSTREE_FEATURES $release_build_type"
# P2P API is public in OSTree >= 2018.6
OSTREE_FEATURES="$OSTREE_FEATURES p2p"
# Strip leading whitespace
OSTREE_FEATURES=$(echo ${OSTREE_FEATURES})
ac_config_files="$ac_config_files Makefile apidoc/Makefile src/libostree/ostree-1.pc src/libostree/ostree-version.h"
cat >confcache <<\_ACEOF
@@ -18286,6 +18320,10 @@ if test -z "${BUILDOPT_INTROSPECTION_TRUE}" && test -z "${BUILDOPT_INTROSPECTION
as_fn_error $? "conditional \"BUILDOPT_INTROSPECTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
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 "${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
@@ -18795,7 +18833,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 2019.2, which was
This file was extended by libostree $as_me 2019.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18861,7 +18899,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 2019.2
libostree config.status 2019.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"