New upstream version 2017.8

This commit is contained in:
Simon McVittie committed 2017-07-18 22:18:02 +01:00
commit b6c0af922c
158 files changed
+12692 -2420

No files matched your search

Vendored
+182 -13
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 2017.7.
# Generated by GNU Autoconf 2.69 for libostree 2017.8.
#
# Report bugs to <walters@verbum.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libostree'
PACKAGE_TARNAME='libostree'
PACKAGE_VERSION='2017.7'
PACKAGE_STRING='libostree 2017.7'
PACKAGE_VERSION='2017.8'
PACKAGE_STRING='libostree 2017.8'
PACKAGE_BUGREPORT='walters@verbum.org'
PACKAGE_URL=''
@@ -672,6 +672,10 @@ USE_LIBMOUNT_FALSE
USE_LIBMOUNT_TRUE
OT_DEP_LIBMOUNT_LIBS
OT_DEP_LIBMOUNT_CFLAGS
USE_AVAHI_FALSE
USE_AVAHI_TRUE
OT_DEP_AVAHI_LIBS
OT_DEP_AVAHI_CFLAGS
USE_OPENSSL_FALSE
USE_OPENSSL_TRUE
OT_DEP_OPENSSL_LIBS
@@ -932,6 +936,7 @@ with_libarchive
with_selinux
with_smack
with_openssl
with_avahi
with_libmount
enable_rofiles_fuse
with_dracut
@@ -980,6 +985,8 @@ OT_DEP_SELINUX_CFLAGS
OT_DEP_SELINUX_LIBS
OT_DEP_OPENSSL_CFLAGS
OT_DEP_OPENSSL_LIBS
OT_DEP_AVAHI_CFLAGS
OT_DEP_AVAHI_LIBS
OT_DEP_LIBMOUNT_CFLAGS
OT_DEP_LIBMOUNT_LIBS
BUILDOPT_FUSE_CFLAGS
@@ -1526,7 +1533,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 2017.7 to adapt to many kinds of systems.
\`configure' configures libostree 2017.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1596,7 +1603,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libostree 2017.7:";;
short | recursive ) echo "Configuration of libostree 2017.8:";;
esac
cat <<\_ACEOF
@@ -1667,6 +1674,7 @@ Optional Packages:
--without-selinux Do not use SELinux
--with-smack Enable smack
--with-openssl Enable use of OpenSSL libcrypto (checksums)
--without-avahi Do not use Avahi
--without-libmount Do not use libmount
--with-dracut Install dracut module (default: no)
--with-mkinitcpio Install mkinitcpio module (default: no)
@@ -1748,6 +1756,10 @@ Some influential environment variables:
C compiler flags for OT_DEP_OPENSSL, overriding pkg-config
OT_DEP_OPENSSL_LIBS
linker flags for OT_DEP_OPENSSL, overriding pkg-config
OT_DEP_AVAHI_CFLAGS
C compiler flags for OT_DEP_AVAHI, overriding pkg-config
OT_DEP_AVAHI_LIBS
linker flags for OT_DEP_AVAHI, overriding pkg-config
OT_DEP_LIBMOUNT_CFLAGS
C compiler flags for OT_DEP_LIBMOUNT, overriding pkg-config
OT_DEP_LIBMOUNT_LIBS
@@ -1827,7 +1839,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libostree configure 2017.7
libostree configure 2017.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2242,7 +2254,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 2017.7, which was
It was created by libostree $as_me 2017.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3110,7 +3122,7 @@ fi
# Define the identity of the package.
PACKAGE='libostree'
VERSION='2017.7'
VERSION='2017.8'
# Some tools Automake needs.
@@ -5844,9 +5856,9 @@ test -n "$YACC" || YACC="yacc"
YEAR_VERSION=2017
RELEASE_VERSION=7
RELEASE_VERSION=8
PACKAGE_VERSION=2017.7
PACKAGE_VERSION=2017.8
@@ -16431,6 +16443,155 @@ else
fi
AVAHI_DEPENDENCY="avahi-client >= 0.6.31 avahi-glib >= 0.6.31"
# Check whether --with-avahi was given.
if test "${with_avahi+set}" = set; then :
withval=$with_avahi; :
else
with_avahi=maybe
fi
if test x$with_avahi != xno ; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $AVAHI_DEPENDENCY" >&5
$as_echo_n "checking for $AVAHI_DEPENDENCY... " >&6; }
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$AVAHI_DEPENDENCY\""; } >&5
($PKG_CONFIG --exists --print-errors "$AVAHI_DEPENDENCY") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
have_avahi=yes
else
have_avahi=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_avahi" >&5
$as_echo "$have_avahi" >&6; }
if test x$have_avahi = xno && test x$with_avahi != xmaybe ; then :
as_fn_error $? "Avahi is enabled but could not be found" "$LINENO" 5
fi
if test x$have_avahi = xyes; then :
$as_echo "#define HAVE_AVAHI 1" >>confdefs.h
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_AVAHI" >&5
$as_echo_n "checking for OT_DEP_AVAHI... " >&6; }
if test -n "$OT_DEP_AVAHI_CFLAGS"; then
pkg_cv_OT_DEP_AVAHI_CFLAGS="$OT_DEP_AVAHI_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$AVAHI_DEPENDENCY\""; } >&5
($PKG_CONFIG --exists --print-errors "$AVAHI_DEPENDENCY") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_OT_DEP_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "$AVAHI_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_AVAHI_LIBS"; then
pkg_cv_OT_DEP_AVAHI_LIBS="$OT_DEP_AVAHI_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$AVAHI_DEPENDENCY\""; } >&5
($PKG_CONFIG --exists --print-errors "$AVAHI_DEPENDENCY") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_OT_DEP_AVAHI_LIBS=`$PKG_CONFIG --libs "$AVAHI_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_AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$AVAHI_DEPENDENCY" 2>&1`
else
OT_DEP_AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$AVAHI_DEPENDENCY" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$OT_DEP_AVAHI_PKG_ERRORS" >&5
as_fn_error $? "Package requirements ($AVAHI_DEPENDENCY) were not met:
$OT_DEP_AVAHI_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables OT_DEP_AVAHI_CFLAGS
and OT_DEP_AVAHI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables OT_DEP_AVAHI_CFLAGS
and OT_DEP_AVAHI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
OT_DEP_AVAHI_CFLAGS=$pkg_cv_OT_DEP_AVAHI_CFLAGS
OT_DEP_AVAHI_LIBS=$pkg_cv_OT_DEP_AVAHI_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
with_avahi=yes
else
with_avahi=no
fi
else
with_avahi=no
fi
if test x$with_avahi != xno; then OSTREE_FEATURES="$OSTREE_FEATURES avahi"; fi
if test $with_avahi != no; then
USE_AVAHI_TRUE=
USE_AVAHI_FALSE='#'
else
USE_AVAHI_TRUE='#'
USE_AVAHI_FALSE=
fi
LIBMOUNT_DEPENDENCY="mount >= 2.23.0"
@@ -17094,10 +17255,14 @@ else
fi
if test -z "$BUILDOPT_IS_DEVEL_BUILD_TRUE"; then :
release_build_type=devel
$as_echo "#define BUILDOPT_IS_DEVEL_BUILD 1" >>confdefs.h
release_build_type=devel
else
release_build_type=release
fi
OSTREE_FEATURES="$OSTREE_FEATURES $release_build_type"
ac_config_files="$ac_config_files Makefile apidoc/Makefile src/libostree/ostree-1.pc src/libostree/ostree-version.h"
@@ -17338,6 +17503,10 @@ if test -z "${USE_OPENSSL_TRUE}" && test -z "${USE_OPENSSL_FALSE}"; then
as_fn_error $? "conditional \"USE_OPENSSL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_AVAHI_TRUE}" && test -z "${USE_AVAHI_FALSE}"; then
as_fn_error $? "conditional \"USE_AVAHI\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LIBMOUNT_TRUE}" && test -z "${USE_LIBMOUNT_FALSE}"; then
as_fn_error $? "conditional \"USE_LIBMOUNT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17787,7 +17956,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 2017.7, which was
This file was extended by libostree $as_me 2017.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17853,7 +18022,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 2017.7
libostree config.status 2017.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"