New upstream version 2017.3
This commit is contained in:
commit
057de00126
134 files changed
+7527
-2384
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 ostree 2017.1.
|
||||
# Generated by GNU Autoconf 2.69 for libostree 2017.3.
|
||||
#
|
||||
# Report bugs to <walters@verbum.org>.
|
||||
#
|
||||
@@ -588,10 +588,10 @@ MFLAGS=
|
||||
MAKEFLAGS=
|
||||
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='ostree'
|
||||
PACKAGE_TARNAME='ostree'
|
||||
PACKAGE_VERSION='2017.1'
|
||||
PACKAGE_STRING='ostree 2017.1'
|
||||
PACKAGE_NAME='libostree'
|
||||
PACKAGE_TARNAME='libostree'
|
||||
PACKAGE_VERSION='2017.3'
|
||||
PACKAGE_STRING='libostree 2017.3'
|
||||
PACKAGE_BUGREPORT='walters@verbum.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -665,6 +665,8 @@ USE_LIBMOUNT_FALSE
|
||||
USE_LIBMOUNT_TRUE
|
||||
OT_DEP_LIBMOUNT_LIBS
|
||||
OT_DEP_LIBMOUNT_CFLAGS
|
||||
USE_SMACK_FALSE
|
||||
USE_SMACK_TRUE
|
||||
USE_SELINUX_FALSE
|
||||
USE_SELINUX_TRUE
|
||||
OT_DEP_SELINUX_LIBS
|
||||
@@ -673,6 +675,13 @@ USE_LIBARCHIVE_FALSE
|
||||
USE_LIBARCHIVE_TRUE
|
||||
OT_DEP_LIBARCHIVE_LIBS
|
||||
OT_DEP_LIBARCHIVE_CFLAGS
|
||||
ENABLE_RUST_FALSE
|
||||
ENABLE_RUST_TRUE
|
||||
RUST_DEBUG_FALSE
|
||||
RUST_DEBUG_TRUE
|
||||
RUST_TARGET_SUBDIR
|
||||
rustc
|
||||
cargo
|
||||
ENABLE_MAN_FALSE
|
||||
ENABLE_MAN_TRUE
|
||||
XSLTPROC
|
||||
@@ -712,12 +721,18 @@ INTROSPECTION_GIRDIR
|
||||
INTROSPECTION_GENERATE
|
||||
INTROSPECTION_COMPILER
|
||||
INTROSPECTION_SCANNER
|
||||
USE_CURL_OR_SOUP_FALSE
|
||||
USE_CURL_OR_SOUP_TRUE
|
||||
HAVE_LIBSOUP_CLIENT_CERTS_FALSE
|
||||
HAVE_LIBSOUP_CLIENT_CERTS_TRUE
|
||||
USE_LIBSOUP_FALSE
|
||||
USE_LIBSOUP_TRUE
|
||||
OT_DEP_SOUP_LIBS
|
||||
OT_DEP_SOUP_CFLAGS
|
||||
USE_CURL_FALSE
|
||||
USE_CURL_TRUE
|
||||
OT_DEP_CURL_LIBS
|
||||
OT_DEP_CURL_CFLAGS
|
||||
OT_DEP_E2P_LIBS
|
||||
OT_DEP_E2P_CFLAGS
|
||||
OT_DEP_ZLIB_LIBS
|
||||
@@ -883,6 +898,7 @@ enable_always_build_tests
|
||||
enable_otmpfile
|
||||
enable_wrpseudo_compat
|
||||
enable_glibtest
|
||||
with_curl
|
||||
with_soup
|
||||
enable_libsoup_client_certs
|
||||
enable_introspection
|
||||
@@ -892,8 +908,11 @@ enable_gtk_doc
|
||||
enable_gtk_doc_html
|
||||
enable_gtk_doc_pdf
|
||||
enable_man
|
||||
enable_rust
|
||||
enable_rust_debug
|
||||
with_libarchive
|
||||
with_selinux
|
||||
with_smack
|
||||
with_libmount
|
||||
enable_rofiles_fuse
|
||||
with_dracut
|
||||
@@ -926,6 +945,8 @@ OT_DEP_ZLIB_CFLAGS
|
||||
OT_DEP_ZLIB_LIBS
|
||||
OT_DEP_E2P_CFLAGS
|
||||
OT_DEP_E2P_LIBS
|
||||
OT_DEP_CURL_CFLAGS
|
||||
OT_DEP_CURL_LIBS
|
||||
OT_DEP_SOUP_CFLAGS
|
||||
OT_DEP_SOUP_LIBS
|
||||
OT_DEP_GPGME_CFLAGS
|
||||
@@ -1482,7 +1503,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 ostree 2017.1 to adapt to many kinds of systems.
|
||||
\`configure' configures libostree 2017.3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1530,7 +1551,7 @@ Fine tuning of the installation directories:
|
||||
--infodir=DIR info documentation [DATAROOTDIR/info]
|
||||
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
||||
--mandir=DIR man documentation [DATAROOTDIR/man]
|
||||
--docdir=DIR documentation root [DATAROOTDIR/doc/ostree]
|
||||
--docdir=DIR documentation root [DATAROOTDIR/doc/libostree]
|
||||
--htmldir=DIR html documentation [DOCDIR]
|
||||
--dvidir=DIR dvi documentation [DOCDIR]
|
||||
--pdfdir=DIR pdf documentation [DOCDIR]
|
||||
@@ -1552,7 +1573,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of ostree 2017.1:";;
|
||||
short | recursive ) echo "Configuration of libostree 2017.3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1593,6 +1614,9 @@ Optional Features:
|
||||
--enable-gtk-doc-html build documentation in html format [[default=yes]]
|
||||
--enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
|
||||
--enable-man generate man pages [default=auto]
|
||||
--enable-rust Compile Rust code instead of C [default=no]
|
||||
--enable-rust-debug Build Rust code with debugging information
|
||||
[default=no]
|
||||
--enable-rofiles-fuse generate rofiles-fuse helper [default=yes]
|
||||
|
||||
Optional Packages:
|
||||
@@ -1606,11 +1630,13 @@ Optional Packages:
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
|
||||
compiler's sysroot if not specified).
|
||||
--with-curl Use libcurl [default=no]
|
||||
--with-soup Use libsoup [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
|
||||
--without-selinux Do not use SELinux
|
||||
--with-smack Enable smack
|
||||
--without-libmount Do not use libmount
|
||||
--with-dracut Install dracut module (default: no)
|
||||
--with-mkinitcpio Install mkinitcpio module (default: no)
|
||||
@@ -1662,6 +1688,10 @@ Some influential environment variables:
|
||||
C compiler flags for OT_DEP_E2P, overriding pkg-config
|
||||
OT_DEP_E2P_LIBS
|
||||
linker flags for OT_DEP_E2P, overriding pkg-config
|
||||
OT_DEP_CURL_CFLAGS
|
||||
C compiler flags for OT_DEP_CURL, overriding pkg-config
|
||||
OT_DEP_CURL_LIBS
|
||||
linker flags for OT_DEP_CURL, overriding pkg-config
|
||||
OT_DEP_SOUP_CFLAGS
|
||||
C compiler flags for OT_DEP_SOUP, overriding pkg-config
|
||||
OT_DEP_SOUP_LIBS
|
||||
@@ -1761,7 +1791,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
ostree configure 2017.1
|
||||
libostree configure 2017.3
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -2176,7 +2206,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 ostree $as_me 2017.1, which was
|
||||
It was created by libostree $as_me 2017.3, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -3042,8 +3072,8 @@ fi
|
||||
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='ostree'
|
||||
VERSION='2017.1'
|
||||
PACKAGE='libostree'
|
||||
VERSION='2017.3'
|
||||
|
||||
|
||||
# Some tools Automake needs.
|
||||
@@ -5793,7 +5823,6 @@ test -n "$YACC" || YACC="yacc"
|
||||
-Werror=incompatible-pointer-types \
|
||||
-Werror=misleading-indentation \
|
||||
-Werror=missing-include-dirs -Werror=aggregate-return \
|
||||
-Werror=declaration-after-statement \
|
||||
; do
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5
|
||||
@@ -13562,9 +13591,9 @@ else
|
||||
fi
|
||||
|
||||
if test "$ENABLE_INSTALLED_TESTS" == "1"; then
|
||||
installed_test_metadir=${datadir}/installed-tests/ostree
|
||||
installed_test_metadir=${datadir}/installed-tests/libostree
|
||||
|
||||
installed_testdir=${libexecdir}/installed-tests/ostree
|
||||
installed_testdir=${libexecdir}/installed-tests/libostree
|
||||
|
||||
fi
|
||||
|
||||
@@ -14500,16 +14529,137 @@ $as_echo "yes" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
CURL_DEPENDENCY=7.29.0
|
||||
|
||||
# Check whether --with-curl was given.
|
||||
if test "${with_curl+set}" = set; then :
|
||||
withval=$with_curl;
|
||||
else
|
||||
with_curl=no
|
||||
fi
|
||||
|
||||
if test x$with_curl != xno ; then :
|
||||
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OT_DEP_CURL" >&5
|
||||
$as_echo_n "checking for OT_DEP_CURL... " >&6; }
|
||||
|
||||
if test -n "$OT_DEP_CURL_CFLAGS"; then
|
||||
pkg_cv_OT_DEP_CURL_CFLAGS="$OT_DEP_CURL_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= \$CURL_DEPENDENCY\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "libcurl >= $CURL_DEPENDENCY") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_OT_DEP_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= $CURL_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_CURL_LIBS"; then
|
||||
pkg_cv_OT_DEP_CURL_LIBS="$OT_DEP_CURL_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= \$CURL_DEPENDENCY\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "libcurl >= $CURL_DEPENDENCY") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_OT_DEP_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= $CURL_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_CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= $CURL_DEPENDENCY" 2>&1`
|
||||
else
|
||||
OT_DEP_CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= $CURL_DEPENDENCY" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$OT_DEP_CURL_PKG_ERRORS" >&5
|
||||
|
||||
as_fn_error $? "Package requirements (libcurl >= $CURL_DEPENDENCY) were not met:
|
||||
|
||||
$OT_DEP_CURL_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_CURL_CFLAGS
|
||||
and OT_DEP_CURL_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_CURL_CFLAGS
|
||||
and OT_DEP_CURL_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_CURL_CFLAGS=$pkg_cv_OT_DEP_CURL_CFLAGS
|
||||
OT_DEP_CURL_LIBS=$pkg_cv_OT_DEP_CURL_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
fi
|
||||
with_curl=yes
|
||||
|
||||
$as_echo "#define HAVE_LIBCURL 1" >>confdefs.h
|
||||
|
||||
with_soup_default=yes
|
||||
|
||||
else
|
||||
with_soup_default=check
|
||||
fi
|
||||
if test x$with_curl != xno; then
|
||||
USE_CURL_TRUE=
|
||||
USE_CURL_FALSE='#'
|
||||
else
|
||||
USE_CURL_TRUE='#'
|
||||
USE_CURL_FALSE=
|
||||
fi
|
||||
|
||||
if test x$with_curl = xyes; then OSTREE_FEATURES="$OSTREE_FEATURES libcurl"; fi
|
||||
|
||||
SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
|
||||
|
||||
# Check whether --with-soup was given.
|
||||
if test "${with_soup+set}" = set; then :
|
||||
withval=$with_soup;
|
||||
else
|
||||
with_soup=check
|
||||
with_soup=$with_soup_default
|
||||
fi
|
||||
|
||||
if test x$with_soup != xno ; then :
|
||||
if test x$with_soup != xno; then :
|
||||
|
||||
# Check whether --enable-libsoup_client_certs was given.
|
||||
if test "${enable_libsoup_client_certs+set}" = set; then :
|
||||
@@ -14664,7 +14814,7 @@ fi
|
||||
else
|
||||
with_soup=no
|
||||
fi
|
||||
if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libsoup"; fi
|
||||
if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
|
||||
if test x$with_soup != xno; then
|
||||
USE_LIBSOUP_TRUE=
|
||||
USE_LIBSOUP_FALSE='#'
|
||||
@@ -14682,6 +14832,32 @@ else
|
||||
fi
|
||||
|
||||
|
||||
if test x$with_curl = xyes && test x$with_soup = xno; then :
|
||||
|
||||
as_fn_error $? "Curl enabled, but libsoup is not; libsoup is needed for tests" "$LINENO" 5
|
||||
|
||||
fi
|
||||
if test x$with_curl != xno || test x$with_soup != xno; then
|
||||
USE_CURL_OR_SOUP_TRUE=
|
||||
USE_CURL_OR_SOUP_FALSE='#'
|
||||
else
|
||||
USE_CURL_OR_SOUP_TRUE='#'
|
||||
USE_CURL_OR_SOUP_FALSE=
|
||||
fi
|
||||
|
||||
if test x$with_curl != xno || test x$with_soup != xno; then :
|
||||
|
||||
$as_echo "#define HAVE_LIBCURL_OR_LIBSOUP 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
if test x$with_curl = xyes; then :
|
||||
fetcher_backend=curl
|
||||
elif test x$with_soup = xyes; then :
|
||||
fetcher_backend=libsoup
|
||||
else
|
||||
fetcher_backend=none
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -14720,7 +14896,7 @@ fi
|
||||
test $ac_status = 0; }; then
|
||||
found_introspection=yes
|
||||
else
|
||||
as_fn_error $? "You need to have gobject-introspection >= 1.34.0 installed to build ostree" "$LINENO" 5
|
||||
as_fn_error $? "You need to have gobject-introspection >= 1.34.0 installed to build libostree" "$LINENO" 5
|
||||
fi
|
||||
;; #(
|
||||
auto) :
|
||||
@@ -15129,7 +15305,7 @@ if test x$have_gpgme = xno ; then :
|
||||
as_fn_error $? "Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later" "$LINENO" 5
|
||||
|
||||
fi
|
||||
OSTREE_FEATURES="$OSTREE_FEATURES +gpgme"
|
||||
OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
|
||||
|
||||
LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
|
||||
# What's in RHEL7.2.
|
||||
@@ -15568,8 +15744,11 @@ fi
|
||||
fi
|
||||
enable_man=no
|
||||
|
||||
else
|
||||
|
||||
enable_man=yes
|
||||
|
||||
fi
|
||||
enable_man=yes
|
||||
|
||||
fi
|
||||
if test "$enable_man" != no; then
|
||||
@@ -15581,6 +15760,143 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-rust was given.
|
||||
if test "${enable_rust+set}" = set; then :
|
||||
enableval=$enable_rust;
|
||||
else
|
||||
enable_rust=no; rust_debug_release=no
|
||||
fi
|
||||
|
||||
|
||||
if test "$enable_rust" = yes; then :
|
||||
|
||||
# Extract the first word of "cargo", so it can be a program name with args.
|
||||
set dummy cargo; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_cargo+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $cargo in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_cargo="$cargo" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_cargo="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
cargo=$ac_cv_path_cargo
|
||||
if test -n "$cargo"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cargo" >&5
|
||||
$as_echo "$cargo" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$cargo"; then :
|
||||
as_fn_error $? "cargo is required for --enable-rust" "$LINENO" 5
|
||||
fi
|
||||
# Extract the first word of "rustc", so it can be a program name with args.
|
||||
set dummy rustc; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_rustc+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $rustc in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_rustc="$rustc" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_rustc="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
rustc=$ac_cv_path_rustc
|
||||
if test -n "$rustc"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rustc" >&5
|
||||
$as_echo "$rustc" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$rustc"; then :
|
||||
as_fn_error $? "rustc is required for --enable-rust" "$LINENO" 5
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-rust-debug was given.
|
||||
if test "${enable_rust_debug+set}" = set; then :
|
||||
enableval=$enable_rust_debug; rust_debug_release=$enableval
|
||||
else
|
||||
rust_debug_release=release
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Rust code with debugging information" >&5
|
||||
$as_echo_n "checking whether to build Rust code with debugging information... " >&6; }
|
||||
if test "x$rust_debug_release" = "xyes" ; then
|
||||
rust_debug_release=debug
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
RUST_TARGET_SUBDIR=${rust_debug_release}
|
||||
|
||||
|
||||
fi
|
||||
if test "x$rust_debug_release" = "xdebug"; then
|
||||
RUST_DEBUG_TRUE=
|
||||
RUST_DEBUG_FALSE='#'
|
||||
else
|
||||
RUST_DEBUG_TRUE='#'
|
||||
RUST_DEBUG_FALSE=
|
||||
fi
|
||||
|
||||
if test "$enable_rust" != no; then
|
||||
ENABLE_RUST_TRUE=
|
||||
ENABLE_RUST_FALSE='#'
|
||||
else
|
||||
ENABLE_RUST_TRUE='#'
|
||||
ENABLE_RUST_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-libarchive was given.
|
||||
if test "${with_libarchive+set}" = set; then :
|
||||
@@ -15732,7 +16048,7 @@ fi
|
||||
else
|
||||
with_libarchive=no
|
||||
fi
|
||||
if test x$with_libarchive != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libarchive"; fi
|
||||
if test x$with_libarchive != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libarchive"; fi
|
||||
if test $with_libarchive != no; then
|
||||
USE_LIBARCHIVE_TRUE=
|
||||
USE_LIBARCHIVE_FALSE='#'
|
||||
@@ -15881,7 +16197,7 @@ fi
|
||||
else
|
||||
with_selinux=no
|
||||
fi
|
||||
if test x$with_selinux != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +selinux"; fi
|
||||
if test x$with_selinux != xno; then OSTREE_FEATURES="$OSTREE_FEATURES selinux"; fi
|
||||
if test $with_selinux != no; then
|
||||
USE_SELINUX_TRUE=
|
||||
USE_SELINUX_FALSE='#'
|
||||
@@ -15891,6 +16207,30 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-smack was given.
|
||||
if test "${with_smack+set}" = set; then :
|
||||
withval=$with_smack; :
|
||||
else
|
||||
with_smack=no
|
||||
fi
|
||||
|
||||
if test x$with_smack = xyes; then :
|
||||
|
||||
|
||||
$as_echo "#define WITH_SMACK 1" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
if test $with_smack != no; then
|
||||
USE_SMACK_TRUE=
|
||||
USE_SMACK_FALSE='#'
|
||||
else
|
||||
USE_SMACK_TRUE='#'
|
||||
USE_SMACK_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
LIBMOUNT_DEPENDENCY="mount >= 2.23.0"
|
||||
|
||||
|
||||
@@ -16020,6 +16360,20 @@ $as_echo "yes" >&6; }
|
||||
|
||||
fi
|
||||
with_libmount=yes
|
||||
save_LIBS=$LIBS
|
||||
LIBS=$OT_DEP_LIBMOUNT_LIBS
|
||||
for ac_func in mnt_unref_cache
|
||||
do :
|
||||
ac_fn_c_check_func "$LINENO" "mnt_unref_cache" "ac_cv_func_mnt_unref_cache"
|
||||
if test "x$ac_cv_func_mnt_unref_cache" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_MNT_UNREF_CACHE 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
LIBS=$save_LIBS
|
||||
|
||||
else
|
||||
|
||||
@@ -16030,7 +16384,7 @@ fi
|
||||
else
|
||||
with_libmount=no
|
||||
fi
|
||||
if test x$with_libmount != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libmount"; fi
|
||||
if test x$with_libmount != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libmount"; fi
|
||||
if test $with_libmount != no; then
|
||||
USE_LIBMOUNT_TRUE=
|
||||
USE_LIBMOUNT_FALSE='#'
|
||||
@@ -16631,6 +16985,10 @@ if test -z "${ENABLE_ALWAYS_BUILD_TESTS_TRUE}" && test -z "${ENABLE_ALWAYS_BUILD
|
||||
as_fn_error $? "conditional \"ENABLE_ALWAYS_BUILD_TESTS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_CURL_TRUE}" && test -z "${USE_CURL_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_CURL\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_LIBSOUP_TRUE}" && test -z "${USE_LIBSOUP_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_LIBSOUP\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
@@ -16639,6 +16997,10 @@ if test -z "${HAVE_LIBSOUP_CLIENT_CERTS_TRUE}" && test -z "${HAVE_LIBSOUP_CLIENT
|
||||
as_fn_error $? "conditional \"HAVE_LIBSOUP_CLIENT_CERTS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_CURL_OR_SOUP_TRUE}" && test -z "${USE_CURL_OR_SOUP_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_CURL_OR_SOUP\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
|
||||
as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
@@ -16675,6 +17037,14 @@ if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${RUST_DEBUG_TRUE}" && test -z "${RUST_DEBUG_FALSE}"; then
|
||||
as_fn_error $? "conditional \"RUST_DEBUG\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${ENABLE_RUST_TRUE}" && test -z "${ENABLE_RUST_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_RUST\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_LIBARCHIVE_TRUE}" && test -z "${USE_LIBARCHIVE_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_LIBARCHIVE\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
@@ -16683,6 +17053,10 @@ if test -z "${USE_SELINUX_TRUE}" && test -z "${USE_SELINUX_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_SELINUX\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${USE_SMACK_TRUE}" && test -z "${USE_SMACK_FALSE}"; then
|
||||
as_fn_error $? "conditional \"USE_SMACK\" 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
|
||||
@@ -17120,7 +17494,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 ostree $as_me 2017.1, which was
|
||||
This file was extended by libostree $as_me 2017.3, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -17186,7 +17560,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="\\
|
||||
ostree config.status 2017.1
|
||||
libostree config.status 2017.3
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
@@ -18875,14 +19249,14 @@ fi
|
||||
|
||||
|
||||
echo "
|
||||
OSTree $VERSION
|
||||
libOSTree $VERSION
|
||||
===============
|
||||
|
||||
|
||||
introspection: $found_introspection
|
||||
Rust (internal oxidation): $rust_debug_release
|
||||
rofiles-fuse: $enable_rofiles_fuse
|
||||
libsoup (retrieve remote HTTP repositories): $with_soup
|
||||
libsoup TLS client certs: $have_libsoup_client_certs
|
||||
HTTP backend: $fetcher_backend
|
||||
SELinux: $with_selinux
|
||||
systemd: $have_libsystemd
|
||||
libmount: $with_libmount
|
||||
|
||||
Reference in new issue
Block a user