configure (flatpak-1.15.1.tar.xz) | : | configure (flatpak-1.15.2.tar.xz) | ||
---|---|---|---|---|
#! /bin/sh | #! /bin/sh | |||
# Guess values for system-dependent variables and create Makefiles. | # Guess values for system-dependent variables and create Makefiles. | |||
# Generated by GNU Autoconf 2.71 for Flatpak 1.15.1. | # Generated by GNU Autoconf 2.71 for Flatpak 1.15.2. | |||
# | # | |||
# Report bugs to <https://github.com/flatpak/flatpak/issues>. | # Report bugs to <https://github.com/flatpak/flatpak/issues>. | |||
# | # | |||
# | # | |||
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, | # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, | |||
# Inc. | # Inc. | |||
# | # | |||
# | # | |||
# This configure script is free software; the Free Software Foundation | # This configure script is free software; the Free Software Foundation | |||
# gives unlimited permission to copy, distribute and modify it. | # gives unlimited permission to copy, distribute and modify it. | |||
skipping to change at line 613 | skipping to change at line 613 | |||
ac_config_libobj_dir=. | ac_config_libobj_dir=. | |||
LIBOBJS= | LIBOBJS= | |||
cross_compiling=no | cross_compiling=no | |||
subdirs= | subdirs= | |||
MFLAGS= | MFLAGS= | |||
MAKEFLAGS= | MAKEFLAGS= | |||
# Identity of this package. | # Identity of this package. | |||
PACKAGE_NAME='Flatpak' | PACKAGE_NAME='Flatpak' | |||
PACKAGE_TARNAME='flatpak' | PACKAGE_TARNAME='flatpak' | |||
PACKAGE_VERSION='1.15.1' | PACKAGE_VERSION='1.15.2' | |||
PACKAGE_STRING='Flatpak 1.15.1' | PACKAGE_STRING='Flatpak 1.15.2' | |||
PACKAGE_BUGREPORT='https://github.com/flatpak/flatpak/issues' | PACKAGE_BUGREPORT='https://github.com/flatpak/flatpak/issues' | |||
PACKAGE_URL='http://flatpak.org/' | PACKAGE_URL='http://flatpak.org/' | |||
# Factoring default headers for most tests. | # Factoring default headers for most tests. | |||
ac_includes_default="\ | ac_includes_default="\ | |||
#include <stddef.h> | #include <stddef.h> | |||
#ifdef HAVE_STDIO_H | #ifdef HAVE_STDIO_H | |||
# include <stdio.h> | # include <stdio.h> | |||
#endif | #endif | |||
#ifdef HAVE_STDLIB_H | #ifdef HAVE_STDLIB_H | |||
skipping to change at line 756 | skipping to change at line 756 | |||
BUILD_AUTO_SIDELOADING_TRUE | BUILD_AUTO_SIDELOADING_TRUE | |||
BUILD_SYSTEM_HELPER_FALSE | BUILD_SYSTEM_HELPER_FALSE | |||
BUILD_SYSTEM_HELPER_TRUE | BUILD_SYSTEM_HELPER_TRUE | |||
POLKIT_LIBS | POLKIT_LIBS | |||
POLKIT_CFLAGS | POLKIT_CFLAGS | |||
BUILD_SELINUX_MODULE_FALSE | BUILD_SELINUX_MODULE_FALSE | |||
BUILD_SELINUX_MODULE_TRUE | BUILD_SELINUX_MODULE_TRUE | |||
GPGME_PTHREAD_LIBS | GPGME_PTHREAD_LIBS | |||
GPGME_PTHREAD_CFLAGS | GPGME_PTHREAD_CFLAGS | |||
GPGME_CONFIG | GPGME_CONFIG | |||
GPGRT_CONFIG | ||||
DEP_GPGME_PTHREAD_LIBS | DEP_GPGME_PTHREAD_LIBS | |||
DEP_GPGME_PTHREAD_CFLAGS | DEP_GPGME_PTHREAD_CFLAGS | |||
DEP_GPGME_LIBS | DEP_GPGME_LIBS | |||
DEP_GPGME_CFLAGS | DEP_GPGME_CFLAGS | |||
http_backend | http_backend | |||
USE_SOUP_FALSE | USE_SOUP_FALSE | |||
USE_SOUP_TRUE | USE_SOUP_TRUE | |||
USE_CURL_FALSE | USE_CURL_FALSE | |||
USE_CURL_TRUE | USE_CURL_TRUE | |||
SOUP_LIBS | SOUP_LIBS | |||
skipping to change at line 1632 | skipping to change at line 1633 | |||
eval ac_cv_env_${ac_var}_value=\$${ac_var} | eval ac_cv_env_${ac_var}_value=\$${ac_var} | |||
done | done | |||
# | # | |||
# Report the --help message. | # Report the --help message. | |||
# | # | |||
if test "$ac_init_help" = "long"; then | if test "$ac_init_help" = "long"; then | |||
# Omit some internal or obsolete options to make the list less imposing. | # 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. | # This message is too long to be a string in the A/UX 3.1 sh. | |||
cat <<_ACEOF | cat <<_ACEOF | |||
\`configure' configures Flatpak 1.15.1 to adapt to many kinds of systems. | \`configure' configures Flatpak 1.15.2 to adapt to many kinds of systems. | |||
Usage: $0 [OPTION]... [VAR=VALUE]... | Usage: $0 [OPTION]... [VAR=VALUE]... | |||
To assign environment variables (e.g., CC, CFLAGS...), specify them as | To assign environment variables (e.g., CC, CFLAGS...), specify them as | |||
VAR=VALUE. See below for descriptions of some of the useful variables. | VAR=VALUE. See below for descriptions of some of the useful variables. | |||
Defaults for the options are specified in brackets. | Defaults for the options are specified in brackets. | |||
Configuration: | Configuration: | |||
-h, --help display this help and exit | -h, --help display this help and exit | |||
skipping to change at line 1703 | skipping to change at line 1704 | |||
--program-transform-name=PROGRAM run sed PROGRAM on installed program names | --program-transform-name=PROGRAM run sed PROGRAM on installed program names | |||
System types: | System types: | |||
--build=BUILD configure for building on BUILD [guessed] | --build=BUILD configure for building on BUILD [guessed] | |||
--host=HOST cross-compile to build programs to run on HOST [BUILD] | --host=HOST cross-compile to build programs to run on HOST [BUILD] | |||
_ACEOF | _ACEOF | |||
fi | fi | |||
if test -n "$ac_init_help"; then | if test -n "$ac_init_help"; then | |||
case $ac_init_help in | case $ac_init_help in | |||
short | recursive ) echo "Configuration of Flatpak 1.15.1:";; | short | recursive ) echo "Configuration of Flatpak 1.15.2:";; | |||
esac | esac | |||
cat <<\_ACEOF | cat <<\_ACEOF | |||
Optional Features: | Optional Features: | |||
--disable-option-checking ignore unrecognized --enable/--with options | --disable-option-checking ignore unrecognized --enable/--with options | |||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | |||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | |||
--disable-largefile omit support for large files | --disable-largefile omit support for large files | |||
--enable-static[=PKGS] build static libraries [default=no] | --enable-static[=PKGS] build static libraries [default=no] | |||
--enable-shared[=PKGS] build shared libraries [default=yes] | --enable-shared[=PKGS] build shared libraries [default=yes] | |||
skipping to change at line 1997 | skipping to change at line 1998 | |||
else | else | |||
printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir " >&2 | printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir " >&2 | |||
fi || ac_status=$? | fi || ac_status=$? | |||
cd "$ac_pwd" || { ac_status=$?; break; } | cd "$ac_pwd" || { ac_status=$?; break; } | |||
done | done | |||
fi | fi | |||
test -n "$ac_init_help" && exit $ac_status | test -n "$ac_init_help" && exit $ac_status | |||
if $ac_init_version; then | if $ac_init_version; then | |||
cat <<\_ACEOF | cat <<\_ACEOF | |||
Flatpak configure 1.15.1 | Flatpak configure 1.15.2 | |||
generated by GNU Autoconf 2.71 | generated by GNU Autoconf 2.71 | |||
Copyright (C) 2021 Free Software Foundation, Inc. | Copyright (C) 2021 Free Software Foundation, Inc. | |||
This configure script is free software; the Free Software Foundation | This configure script is free software; the Free Software Foundation | |||
gives unlimited permission to copy, distribute and modify it. | gives unlimited permission to copy, distribute and modify it. | |||
_ACEOF | _ACEOF | |||
exit | exit | |||
fi | fi | |||
## ------------------------ ## | ## ------------------------ ## | |||
skipping to change at line 2348 | skipping to change at line 2349 | |||
ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. | ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. | |||
ac_unsafe_a="$ac_unsafe_z#~" | ac_unsafe_a="$ac_unsafe_z#~" | |||
ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" | ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" | |||
ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ ac_safe_unquote"`;; | ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ ac_safe_unquote"`;; | |||
esac | esac | |||
cat >config.log <<_ACEOF | cat >config.log <<_ACEOF | |||
This file contains any messages produced by compilers while | This file contains any messages produced by compilers while | |||
running configure, to aid debugging if configure makes a mistake. | running configure, to aid debugging if configure makes a mistake. | |||
It was created by Flatpak $as_me 1.15.1, which was | It was created by Flatpak $as_me 1.15.2, which was | |||
generated by GNU Autoconf 2.71. Invocation command line was | generated by GNU Autoconf 2.71. Invocation command line was | |||
$ $0$ac_configure_args_raw | $ $0$ac_configure_args_raw | |||
_ACEOF | _ACEOF | |||
exec 5>>config.log | exec 5>>config.log | |||
{ | { | |||
cat <<_ASUNAME | cat <<_ASUNAME | |||
## --------- ## | ## --------- ## | |||
## Platform. ## | ## Platform. ## | |||
skipping to change at line 13246 | skipping to change at line 13247 | |||
if test -z "$CYGPATH_W"; then | if test -z "$CYGPATH_W"; then | |||
if (cygpath --version) >/dev/null 2>/dev/null; then | if (cygpath --version) >/dev/null 2>/dev/null; then | |||
CYGPATH_W='cygpath -w' | CYGPATH_W='cygpath -w' | |||
else | else | |||
CYGPATH_W=echo | CYGPATH_W=echo | |||
fi | fi | |||
fi | fi | |||
# Define the identity of the package. | # Define the identity of the package. | |||
PACKAGE='flatpak' | PACKAGE='flatpak' | |||
VERSION='1.15.1' | VERSION='1.15.2' | |||
# Some tools Automake needs. | # Some tools Automake needs. | |||
ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} | ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} | |||
AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} | AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} | |||
AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} | AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} | |||
AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} | AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} | |||
skipping to change at line 16818 | skipping to change at line 16819 | |||
GLIB_MKENUMS=`$PKG_CONFIG --variable glib_mkenums glib-2.0` | GLIB_MKENUMS=`$PKG_CONFIG --variable glib_mkenums glib-2.0` | |||
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` | GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` | |||
GDBUS_CODEGEN=`$PKG_CONFIG --variable gdbus_codegen gio-2.0` | GDBUS_CODEGEN=`$PKG_CONFIG --variable gdbus_codegen gio-2.0` | |||
POLKIT_GOBJECT_REQUIRED=0.98 | POLKIT_GOBJECT_REQUIRED=0.98 | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ARCHIVE" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libarchive >= 2.8.0" | |||
printf %s "checking for ARCHIVE... " >&6; } | >&5 | |||
printf %s "checking for libarchive >= 2.8.0... " >&6; } | ||||
if test -n "$ARCHIVE_CFLAGS"; then | if test -n "$ARCHIVE_CFLAGS"; then | |||
pkg_cv_ARCHIVE_CFLAGS="$ARCHIVE_CFLAGS" | pkg_cv_ARCHIVE_CFLAGS="$ARCHIVE_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libarchive >= 2.8.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libarchive >= 2.8.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libarchive >= 2.8.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "libarchive >= 2.8.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 16857 | skipping to change at line 16858 | |||
pkg_cv_ARCHIVE_LIBS=`$PKG_CONFIG --libs "libarchive >= 2.8.0" 2>/dev/null` | pkg_cv_ARCHIVE_LIBS=`$PKG_CONFIG --libs "libarchive >= 2.8.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --c flags --libs "libarchive >= 2.8.0" 2>&1` | ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors -- cflags --libs "libarchive >= 2.8.0" 2>&1` | |||
else | else | |||
ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "l ibarchive >= 2.8.0" 2>&1` | ARCHIVE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libarchive >= 2.8.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$ARCHIVE_PKG_ERRORS" >&5 | echo "$ARCHIVE_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (libarchive >= 2.8.0) were not met: | as_fn_error $? "Package requirements (libarchive >= 2.8.0) were not met: | |||
$ARCHIVE_PKG_ERRORS | $ARCHIVE_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables ARCHIVE_CFLAGS | Alternatively, you may set the environment variables ARCHIVE_CFLAGS | |||
and ARCHIVE_LIBS to avoid the need to call pkg-config. | and ARCHIVE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables ARCHIVE_CFLAGS | Alternatively, you may set the environment variables ARCHIVE_CFLAGS | |||
and ARCHIVE_LIBS to avoid the need to call pkg-config. | and ARCHIVE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS | ARCHIVE_CFLAGS=$pkg_cv_ARCHIVE_CFLAGS | |||
ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS | ARCHIVE_LIBS=$pkg_cv_ARCHIVE_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BASE" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= $GLIB_REQ | |||
printf %s "checking for BASE... " >&6; } | S gio-2.0 gio-unix-2.0" >&5 | |||
printf %s "checking for glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix-2.0... " >&6; } | ||||
if test -n "$BASE_CFLAGS"; then | if test -n "$BASE_CFLAGS"; then | |||
pkg_cv_BASE_CFLAGS="$BASE_CFLAGS" | pkg_cv_BASE_CFLAGS="$BASE_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 gio-unix-2.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 gio-unix-2.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix- 2.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix- 2.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 16946 | skipping to change at line 16947 | |||
pkg_cv_BASE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix- 2.0" 2>/dev/null` | pkg_cv_BASE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix- 2.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix-2.0" 2>&1` | BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix-2.0" 2>&1` | |||
else | else | |||
BASE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib -2.0 >= $GLIB_REQS gio-2.0 gio-unix-2.0" 2>&1` | BASE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gli b-2.0 >= $GLIB_REQS gio-2.0 gio-unix-2.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$BASE_PKG_ERRORS" >&5 | echo "$BASE_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQS gio-2.0 gio- unix-2.0) were not met: | as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQS gio-2.0 gio -unix-2.0) were not met: | |||
$BASE_PKG_ERRORS | $BASE_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables BASE_CFLAGS | Alternatively, you may set the environment variables BASE_CFLAGS | |||
and BASE_LIBS to avoid the need to call pkg-config. | and BASE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables BASE_CFLAGS | Alternatively, you may set the environment variables BASE_CFLAGS | |||
and BASE_LIBS to avoid the need to call pkg-config. | and BASE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
BASE_CFLAGS=$pkg_cv_BASE_CFLAGS | BASE_CFLAGS=$pkg_cv_BASE_CFLAGS | |||
BASE_LIBS=$pkg_cv_BASE_LIBS | BASE_LIBS=$pkg_cv_BASE_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.4" >& | |||
printf %s "checking for XML... " >&6; } | 5 | |||
printf %s "checking for libxml-2.0 >= 2.4... " >&6; } | ||||
if test -n "$XML_CFLAGS"; then | if test -n "$XML_CFLAGS"; then | |||
pkg_cv_XML_CFLAGS="$XML_CFLAGS" | pkg_cv_XML_CFLAGS="$XML_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libxml-2.0 >= 2.4\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libxml-2.0 >= 2.4\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4") 2>&5 | ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.4") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17035 | skipping to change at line 17036 | |||
pkg_cv_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4" 2>/dev/null` | pkg_cv_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflag s --libs "libxml-2.0 >= 2.4" 2>&1` | XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "libxml-2.0 >= 2.4" 2>&1` | |||
else | else | |||
XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxm l-2.0 >= 2.4" 2>&1` | XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libx ml-2.0 >= 2.4" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$XML_PKG_ERRORS" >&5 | echo "$XML_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (libxml-2.0 >= 2.4) were not met: | as_fn_error $? "Package requirements (libxml-2.0 >= 2.4) were not met: | |||
$XML_PKG_ERRORS | $XML_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables XML_CFLAGS | Alternatively, you may set the environment variables XML_CFLAGS | |||
and XML_LIBS to avoid the need to call pkg-config. | and XML_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables XML_CFLAGS | Alternatively, you may set the environment variables XML_CFLAGS | |||
and XML_LIBS to avoid the need to call pkg-config. | and XML_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
XML_CFLAGS=$pkg_cv_XML_CFLAGS | XML_CFLAGS=$pkg_cv_XML_CFLAGS | |||
XML_LIBS=$pkg_cv_XML_LIBS | XML_LIBS=$pkg_cv_XML_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZSTD" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 0.8.1" >&5 | |||
printf %s "checking for ZSTD... " >&6; } | printf %s "checking for libzstd >= 0.8.1... " >&6; } | |||
if test -n "$ZSTD_CFLAGS"; then | if test -n "$ZSTD_CFLAGS"; then | |||
pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS" | pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libzstd >= 0.8.1\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libzstd >= 0.8.1\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libzstd >= 0.8.1") 2>&5 | ($PKG_CONFIG --exists --print-errors "libzstd >= 0.8.1") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17124 | skipping to change at line 17125 | |||
pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd >= 0.8.1" 2>/dev/null` | pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd >= 0.8.1" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "libzstd >= 0.8.1" 2>&1` | ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "libzstd >= 0.8.1" 2>&1` | |||
else | else | |||
ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libz std >= 0.8.1" 2>&1` | ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lib zstd >= 0.8.1" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$ZSTD_PKG_ERRORS" >&5 | echo "$ZSTD_PKG_ERRORS" >&5 | |||
have_zstd=no | have_zstd=no | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_zstd=no | have_zstd=no | |||
else | else | |||
ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS | ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS | |||
ZSTD_LIBS=$pkg_cv_ZSTD_LIBS | ZSTD_LIBS=$pkg_cv_ZSTD_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_zstd=yes | have_zstd=yes | |||
fi | fi | |||
if test $have_zstd = yes; then | if test $have_zstd = yes; then | |||
printf "%s\n" "#define HAVE_ZSTD 1" >>confdefs.h | printf "%s\n" "#define HAVE_ZSTD 1" >>confdefs.h | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DCONF" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dconf >= 0.26" >&5 | |||
printf %s "checking for DCONF... " >&6; } | printf %s "checking for dconf >= 0.26... " >&6; } | |||
if test -n "$DCONF_CFLAGS"; then | if test -n "$DCONF_CFLAGS"; then | |||
pkg_cv_DCONF_CFLAGS="$DCONF_CFLAGS" | pkg_cv_DCONF_CFLAGS="$DCONF_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"dconf >= 0.26\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"dconf >= 0.26\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "dconf >= 0.26") 2>&5 | ($PKG_CONFIG --exists --print-errors "dconf >= 0.26") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17198 | skipping to change at line 17199 | |||
pkg_cv_DCONF_LIBS=`$PKG_CONFIG --libs "dconf >= 0.26" 2>/dev/null` | pkg_cv_DCONF_LIBS=`$PKG_CONFIG --libs "dconf >= 0.26" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
DCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "dconf >= 0.26" 2>&1` | DCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cf lags --libs "dconf >= 0.26" 2>&1` | |||
else | else | |||
DCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dco nf >= 0.26" 2>&1` | DCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dc onf >= 0.26" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$DCONF_PKG_ERRORS" >&5 | echo "$DCONF_PKG_ERRORS" >&5 | |||
have_dconf=no | have_dconf=no | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_dconf=no | have_dconf=no | |||
else | else | |||
DCONF_CFLAGS=$pkg_cv_DCONF_CFLAGS | DCONF_CFLAGS=$pkg_cv_DCONF_CFLAGS | |||
DCONF_LIBS=$pkg_cv_DCONF_LIBS | DCONF_LIBS=$pkg_cv_DCONF_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_dconf=yes | have_dconf=yes | |||
fi | fi | |||
if test $have_dconf = yes; then | if test $have_dconf = yes; then | |||
printf "%s\n" "#define HAVE_DCONF 1" >>confdefs.h | printf "%s\n" "#define HAVE_DCONF 1" >>confdefs.h | |||
fi | fi | |||
# Check whether --with-systemd was given. | # Check whether --with-systemd was given. | |||
if test ${with_systemd+y} | if test ${with_systemd+y} | |||
then : | then : | |||
withval=$with_systemd; | withval=$with_systemd; | |||
else $as_nop | else $as_nop | |||
with_systemd=auto | with_systemd=auto | |||
fi | fi | |||
if test "x$with_systemd" != "xno"; then | if test "x$with_systemd" != "xno"; then | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5 | |||
printf %s "checking for SYSTEMD... " >&6; } | printf %s "checking for libsystemd... " >&6; } | |||
if test -n "$SYSTEMD_CFLAGS"; then | if test -n "$SYSTEMD_CFLAGS"; then | |||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" | pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libsystemd\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libsystemd\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 | ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17282 | skipping to change at line 17283 | |||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` | pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --c flags --libs "libsystemd" 2>&1` | SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors -- cflags --libs "libsystemd" 2>&1` | |||
else | else | |||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "l ibsystemd" 2>&1` | SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$SYSTEMD_PKG_ERRORS" >&5 | echo "$SYSTEMD_PKG_ERRORS" >&5 | |||
have_libsystemd=no | have_libsystemd=no | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_libsystemd=no | have_libsystemd=no | |||
else | else | |||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS | SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS | |||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS | SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_libsystemd=yes | have_libsystemd=yes | |||
fi | fi | |||
if test $have_libsystemd = yes; then | if test $have_libsystemd = yes; then | |||
printf "%s\n" "#define HAVE_LIBSYSTEMD 1" >>confdefs.h | printf "%s\n" "#define HAVE_LIBSYSTEMD 1" >>confdefs.h | |||
elif test "x$with_systemd" == "xyes"; then | elif test "x$with_systemd" == "xyes"; then | |||
as_fn_error $? "systemd was requested but it could not be found" "$LINENO" 5 | as_fn_error $? "systemd was requested but it could not be found" "$LINENO" 5 | |||
fi | fi | |||
else | else | |||
have_libsystemd=no | have_libsystemd=no | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MALCONTENT" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for malcontent-0 >= 0.4.0 | |||
printf %s "checking for MALCONTENT... " >&6; } | " >&5 | |||
printf %s "checking for malcontent-0 >= 0.4.0... " >&6; } | ||||
if test -n "$MALCONTENT_CFLAGS"; then | if test -n "$MALCONTENT_CFLAGS"; then | |||
pkg_cv_MALCONTENT_CFLAGS="$MALCONTENT_CFLAGS" | pkg_cv_MALCONTENT_CFLAGS="$MALCONTENT_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"malcontent-0 >= 0.4.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"malcontent-0 >= 0.4.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "malcontent-0 >= 0.4.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "malcontent-0 >= 0.4.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17361 | skipping to change at line 17362 | |||
pkg_cv_MALCONTENT_LIBS=`$PKG_CONFIG --libs "malcontent-0 >= 0.4.0" 2>/dev/null ` | pkg_cv_MALCONTENT_LIBS=`$PKG_CONFIG --libs "malcontent-0 >= 0.4.0" 2>/dev/null ` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
MALCONTENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "malcontent-0 >= 0.4.0" 2>&1` | MALCONTENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "malcontent-0 >= 0.4.0" 2>&1` | |||
else | else | |||
MALCONTENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "malcontent-0 >= 0.4.0" 2>&1` | MALCONTENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --lib s "malcontent-0 >= 0.4.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$MALCONTENT_PKG_ERRORS" >&5 | echo "$MALCONTENT_PKG_ERRORS" >&5 | |||
have_libmalcontent=no | have_libmalcontent=no | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_libmalcontent=no | have_libmalcontent=no | |||
else | else | |||
MALCONTENT_CFLAGS=$pkg_cv_MALCONTENT_CFLAGS | MALCONTENT_CFLAGS=$pkg_cv_MALCONTENT_CFLAGS | |||
MALCONTENT_LIBS=$pkg_cv_MALCONTENT_LIBS | MALCONTENT_LIBS=$pkg_cv_MALCONTENT_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_libmalcontent=yes | have_libmalcontent=yes | |||
fi | fi | |||
if test "$have_libmalcontent" = "yes" | if test "$have_libmalcontent" = "yes" | |||
then : | then : | |||
printf "%s\n" "#define HAVE_LIBMALCONTENT 1" >>confdefs.h | printf "%s\n" "#define HAVE_LIBMALCONTENT 1" >>confdefs.h | |||
fi | fi | |||
if test "$have_libmalcontent" = "yes"; then | if test "$have_libmalcontent" = "yes"; then | |||
HAVE_LIBMALCONTENT_TRUE= | HAVE_LIBMALCONTENT_TRUE= | |||
HAVE_LIBMALCONTENT_FALSE='#' | HAVE_LIBMALCONTENT_FALSE='#' | |||
else | else | |||
HAVE_LIBMALCONTENT_TRUE='#' | HAVE_LIBMALCONTENT_TRUE='#' | |||
HAVE_LIBMALCONTENT_FALSE= | HAVE_LIBMALCONTENT_FALSE= | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB260" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.60" >&5 | |||
printf %s "checking for GLIB260... " >&6; } | printf %s "checking for glib-2.0 >= 2.60... " >&6; } | |||
if test -n "$GLIB260_CFLAGS"; then | if test -n "$GLIB260_CFLAGS"; then | |||
pkg_cv_GLIB260_CFLAGS="$GLIB260_CFLAGS" | pkg_cv_GLIB260_CFLAGS="$GLIB260_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"glib-2.0 >= 2.60\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"glib-2.0 >= 2.60\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.60") 2>&5 | ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.60") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17443 | skipping to change at line 17444 | |||
pkg_cv_GLIB260_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.60" 2>/dev/null` | pkg_cv_GLIB260_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.60" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
GLIB260_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --c flags --libs "glib-2.0 >= 2.60" 2>&1` | GLIB260_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors -- cflags --libs "glib-2.0 >= 2.60" 2>&1` | |||
else | else | |||
GLIB260_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "g lib-2.0 >= 2.60" 2>&1` | GLIB260_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " glib-2.0 >= 2.60" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$GLIB260_PKG_ERRORS" >&5 | echo "$GLIB260_PKG_ERRORS" >&5 | |||
true | true | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
true | true | |||
else | else | |||
GLIB260_CFLAGS=$pkg_cv_GLIB260_CFLAGS | GLIB260_CFLAGS=$pkg_cv_GLIB260_CFLAGS | |||
GLIB260_LIBS=$pkg_cv_GLIB260_LIBS | GLIB260_LIBS=$pkg_cv_GLIB260_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
printf "%s\n" "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_60" >>confdefs.h | printf "%s\n" "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_60" >>confdefs.h | |||
fi | fi | |||
save_LIBS=$LIBS | save_LIBS=$LIBS | |||
LIBS=$ARCHIVE_LIBS | LIBS=$ARCHIVE_LIBS | |||
ac_fn_c_check_func "$LINENO" "archive_read_support_filter_all" "ac_cv_func_archi ve_read_support_filter_all" | ac_fn_c_check_func "$LINENO" "archive_read_support_filter_all" "ac_cv_func_archi ve_read_support_filter_all" | |||
skipping to change at line 17499 | skipping to change at line 17500 | |||
then : | then : | |||
withval=$with_curl; | withval=$with_curl; | |||
else $as_nop | else $as_nop | |||
with_curl=yes | with_curl=yes | |||
fi | fi | |||
if test x$with_curl != xno | if test x$with_curl != xno | |||
then : | then : | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= $CURL_DEPE | |||
printf %s "checking for CURL... " >&6; } | NDENCY" >&5 | |||
printf %s "checking for libcurl >= $CURL_DEPENDENCY... " >&6; } | ||||
if test -n "$CURL_CFLAGS"; then | if test -n "$CURL_CFLAGS"; then | |||
pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" | pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libcurl >= \$CURL_DEPENDENCY\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libcurl >= \$CURL_DEPENDENCY\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libcurl >= $CURL_DEPENDENCY") 2>&5 | ($PKG_CONFIG --exists --print-errors "libcurl >= $CURL_DEPENDENCY") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17538 | skipping to change at line 17539 | |||
pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= $CURL_DEPENDENCY" 2>/dev/null ` | pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= $CURL_DEPENDENCY" 2>/dev/null ` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "libcurl >= $CURL_DEPENDENCY" 2>&1` | CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "libcurl >= $CURL_DEPENDENCY" 2>&1` | |||
else | else | |||
CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libc url >= $CURL_DEPENDENCY" 2>&1` | CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lib curl >= $CURL_DEPENDENCY" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$CURL_PKG_ERRORS" >&5 | echo "$CURL_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (libcurl >= $CURL_DEPENDENCY) were n ot met: | as_fn_error $? "Package requirements (libcurl >= $CURL_DEPENDENCY) were not met: | |||
$CURL_PKG_ERRORS | $CURL_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables CURL_CFLAGS | Alternatively, you may set the environment variables CURL_CFLAGS | |||
and CURL_LIBS to avoid the need to call pkg-config. | and CURL_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables CURL_CFLAGS | Alternatively, you may set the environment variables CURL_CFLAGS | |||
and CURL_LIBS to avoid the need to call pkg-config. | and CURL_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
CURL_CFLAGS=$pkg_cv_CURL_CFLAGS | CURL_CFLAGS=$pkg_cv_CURL_CFLAGS | |||
CURL_LIBS=$pkg_cv_CURL_LIBS | CURL_LIBS=$pkg_cv_CURL_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
with_curl=yes | with_curl=yes | |||
http_backend=curl | http_backend=curl | |||
printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h | printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h | |||
else $as_nop | else $as_nop | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SOUP" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsoup-2.4" >&5 | |||
printf %s "checking for SOUP... " >&6; } | printf %s "checking for libsoup-2.4... " >&6; } | |||
if test -n "$SOUP_CFLAGS"; then | if test -n "$SOUP_CFLAGS"; then | |||
pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS" | pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libsoup-2.4\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libsoup-2.4\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 | ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17633 | skipping to change at line 17634 | |||
pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null` | pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "libsoup-2.4" 2>&1` | SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "libsoup-2.4" 2>&1` | |||
else | else | |||
SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libs oup-2.4" 2>&1` | SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lib soup-2.4" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$SOUP_PKG_ERRORS" >&5 | echo "$SOUP_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (libsoup-2.4) were not met: | as_fn_error $? "Package requirements (libsoup-2.4) were not met: | |||
$SOUP_PKG_ERRORS | $SOUP_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables SOUP_CFLAGS | Alternatively, you may set the environment variables SOUP_CFLAGS | |||
and SOUP_LIBS to avoid the need to call pkg-config. | and SOUP_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables SOUP_CFLAGS | Alternatively, you may set the environment variables SOUP_CFLAGS | |||
and SOUP_LIBS to avoid the need to call pkg-config. | and SOUP_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS | SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS | |||
SOUP_LIBS=$pkg_cv_SOUP_LIBS | SOUP_LIBS=$pkg_cv_SOUP_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
printf "%s\n" "#define HAVE_SOUP 1" >>confdefs.h | printf "%s\n" "#define HAVE_SOUP 1" >>confdefs.h | |||
http_backend=soup | http_backend=soup | |||
fi | fi | |||
skipping to change at line 17704 | skipping to change at line 17705 | |||
if test x$with_curl == xno; then | if test x$with_curl == xno; then | |||
USE_SOUP_TRUE= | USE_SOUP_TRUE= | |||
USE_SOUP_FALSE='#' | USE_SOUP_FALSE='#' | |||
else | else | |||
USE_SOUP_TRUE='#' | USE_SOUP_TRUE='#' | |||
USE_SOUP_FALSE= | USE_SOUP_FALSE= | |||
fi | fi | |||
LIBGPGME_DEPENDENCY="1.1.8" | LIBGPGME_DEPENDENCY="1.1.8" | |||
# Extract the first word of "gpgrt-config", so it can be a program name with a | ||||
rgs. | ||||
set dummy gpgrt-config; ac_word=$2 | ||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||||
printf %s "checking for $ac_word... " >&6; } | ||||
if test ${ac_cv_path_GPGRT_CONFIG+y} | ||||
then : | ||||
printf %s "(cached) " >&6 | ||||
else $as_nop | ||||
case $GPGRT_CONFIG in | ||||
[\\/]* | ?:[\\/]*) | ||||
ac_cv_path_GPGRT_CONFIG="$GPGRT_CONFIG" # Let the user override the test with | ||||
a path. | ||||
;; | ||||
*) | ||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||||
as_dummy="$prefix/bin:$PATH" | ||||
for as_dir in $as_dummy | ||||
do | ||||
IFS=$as_save_IFS | ||||
case $as_dir in #((( | ||||
'') as_dir=./ ;; | ||||
*/) ;; | ||||
*) as_dir=$as_dir/ ;; | ||||
esac | ||||
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_GPGRT_CONFIG="$as_dir$ac_word$ac_exec_ext" | ||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ex | ||||
t" >&5 | ||||
break 2 | ||||
fi | ||||
done | ||||
done | ||||
IFS=$as_save_IFS | ||||
test -z "$ac_cv_path_GPGRT_CONFIG" && ac_cv_path_GPGRT_CONFIG="no" | ||||
;; | ||||
esac | ||||
fi | ||||
GPGRT_CONFIG=$ac_cv_path_GPGRT_CONFIG | ||||
if test -n "$GPGRT_CONFIG"; then | ||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GPGRT_CONFIG" >&5 | ||||
printf "%s\n" "$GPGRT_CONFIG" >&6; } | ||||
else | ||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||||
printf "%s\n" "no" >&6; } | ||||
fi | ||||
if test "$GPGRT_CONFIG" != "no"; then | ||||
# Determine gpgrt_libdir | ||||
# | ||||
# Get the prefix of gpgrt-config assuming it's something like: | ||||
# <PREFIX>/bin/gpgrt-config | ||||
gpgrt_prefix=${GPGRT_CONFIG%/*/*} | ||||
possible_libdir1=${gpgrt_prefix}/lib | ||||
# Determine by using system libdir-format with CC, it's like: | ||||
# Normal style: /usr/lib | ||||
# GNU cross style: /usr/<triplet>/lib | ||||
# Debian style: /usr/lib/<multiarch-name> | ||||
# Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 | ||||
# It is assumed that CC is specified to the one of host on cross build. | ||||
if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ | ||||
sed -n -e "/^libraries/{s/libraries: =//;s/:/\\ | ||||
/g;p;}"); then | ||||
# From the output of -print-search-dirs, select valid pkgconfig dirs. | ||||
libdir_candidates=$(for dir in $libdir_candidates; do | ||||
if p=$(cd $dir 2>/dev/null && pwd); then | ||||
test -d "$p/pkgconfig" && echo $p; | ||||
fi | ||||
done) | ||||
for possible_libdir0 in $libdir_candidates; do | ||||
# possible_libdir0: | ||||
# Fallback candidate, the one of system-installed (by $CC) | ||||
# (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32) | ||||
# possible_libdir1: | ||||
# Another candidate, user-locally-installed | ||||
# (<gpgrt_prefix>/lib) | ||||
# possible_libdir2 | ||||
# Most preferred | ||||
# (<gpgrt_prefix>/<triplet>/lib, | ||||
# <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32) | ||||
if test "${possible_libdir0##*/}" = "lib"; then | ||||
possible_prefix0=${possible_libdir0%/lib} | ||||
possible_prefix0_triplet=${possible_prefix0##*/} | ||||
if test -z "$possible_prefix0_triplet"; then | ||||
continue | ||||
fi | ||||
possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib | ||||
else | ||||
possible_prefix0=${possible_libdir0%%/lib*} | ||||
possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0} | ||||
fi | ||||
if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then | ||||
gpgrt_libdir=${possible_libdir2} | ||||
elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then | ||||
gpgrt_libdir=${possible_libdir1} | ||||
elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then | ||||
gpgrt_libdir=${possible_libdir0} | ||||
fi | ||||
if test -n "$gpgrt_libdir"; then break; fi | ||||
done | ||||
if test -z "$libdir_candidates"; then | ||||
# No valid pkgconfig dir in any of the system directories, fallback | ||||
gpgrt_libdir=${possible_libdir1} | ||||
fi | ||||
else | ||||
# When we cannot determine system libdir-format, use this: | ||||
gpgrt_libdir=${possible_libdir1} | ||||
fi | ||||
else | ||||
unset GPGRT_CONFIG | ||||
fi | ||||
if test -n "$gpgrt_libdir"; then | ||||
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" | ||||
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then | ||||
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" | ||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use gpgrt-config with $gpgrt | ||||
_libdir as gpg-error-config" >&5 | ||||
printf "%s\n" "$as_me: Use gpgrt-config with $gpgrt_libdir as gpg-error-config" | ||||
>&6;} | ||||
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` | ||||
else | ||||
unset GPGRT_CONFIG | ||||
fi | ||||
elif test "$GPG_ERROR_CONFIG" != "no"; then | ||||
gpg_error_config_version=`$GPG_ERROR_CONFIG --version` | ||||
unset GPGRT_CONFIG | ||||
fi | ||||
# Check whether --with-gpgme-prefix was given. | # Check whether --with-gpgme-prefix was given. | |||
if test ${with_gpgme_prefix+y} | if test ${with_gpgme_prefix+y} | |||
then : | then : | |||
withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" | withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" | |||
else $as_nop | else $as_nop | |||
gpgme_config_prefix="" | gpgme_config_prefix="" | |||
fi | fi | |||
if test x"${GPGME_CONFIG}" = x ; then | if test x"${GPGME_CONFIG}" = x ; then | |||
skipping to change at line 17734 | skipping to change at line 17861 | |||
;; | ;; | |||
*) | *) | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYS ROOT as it is not an absolute path." >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYS ROOT as it is not an absolute path." >&5 | |||
printf "%s\n" "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path ." >&2;} | printf "%s\n" "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path ." >&2;} | |||
;; | ;; | |||
esac | esac | |||
fi | fi | |||
fi | fi | |||
use_gpgrt_config="" | use_gpgrt_config="" | |||
if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then | if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then | |||
if $GPGRT_CONFIG gpgme --exists; then | if $GPGRT_CONFIG gpgme --exists; then | |||
GPGME_CONFIG="$GPGRT_CONFIG gpgme" | GPGME_CONFIG="$GPGRT_CONFIG gpgme" | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as gpgme-co nfig" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as gpgme-co nfig" >&5 | |||
printf "%s\n" "$as_me: Use gpgrt-config as gpgme-config" >&6;} | printf "%s\n" "$as_me: Use gpgrt-config as gpgme-config" >&6;} | |||
use_gpgrt_config=yes | use_gpgrt_config=yes | |||
fi | fi | |||
fi | fi | |||
if test -z "$use_gpgrt_config"; then | if test -z "$use_gpgrt_config"; then | |||
# Extract the first word of "gpgme-config", so it can be a program name with args. | # Extract the first word of "gpgme-config", so it can be a program name with args. | |||
set dummy gpgme-config; ac_word=$2 | set dummy gpgme-config; ac_word=$2 | |||
skipping to change at line 17805 | skipping to change at line 17932 | |||
fi | fi | |||
fi | fi | |||
gpgme_version_major=`echo $gpgme_version | \ | gpgme_version_major=`echo $gpgme_version | \ | |||
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` | |||
gpgme_version_minor=`echo $gpgme_version | \ | gpgme_version_minor=`echo $gpgme_version | \ | |||
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` | |||
gpgme_version_micro=`echo $gpgme_version | \ | gpgme_version_micro=`echo $gpgme_version | \ | |||
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DEP_GPGME" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpgme >= 1.8.0" >&5 | |||
printf %s "checking for DEP_GPGME... " >&6; } | printf %s "checking for gpgme >= 1.8.0... " >&6; } | |||
if test -n "$DEP_GPGME_CFLAGS"; then | if test -n "$DEP_GPGME_CFLAGS"; then | |||
pkg_cv_DEP_GPGME_CFLAGS="$DEP_GPGME_CFLAGS" | pkg_cv_DEP_GPGME_CFLAGS="$DEP_GPGME_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gpgme >= 1.8.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gpgme >= 1.8.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "gpgme >= 1.8.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "gpgme >= 1.8.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17844 | skipping to change at line 17971 | |||
pkg_cv_DEP_GPGME_LIBS=`$PKG_CONFIG --libs "gpgme >= 1.8.0" 2>/dev/null` | pkg_cv_DEP_GPGME_LIBS=`$PKG_CONFIG --libs "gpgme >= 1.8.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
DEP_GPGME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors - -cflags --libs "gpgme >= 1.8.0" 2>&1` | DEP_GPGME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gpgme >= 1.8.0" 2>&1` | |||
else | else | |||
DEP_GPGME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gpgme >= 1.8.0" 2>&1` | DEP_GPGME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gpgme >= 1.8.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$DEP_GPGME_PKG_ERRORS" >&5 | echo "$DEP_GPGME_PKG_ERRORS" >&5 | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DEP_GPGME_PTHREAD" >& | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpgme-pthread >= $LIB | |||
5 | GPGME_DEPENDENCY" >&5 | |||
printf %s "checking for DEP_GPGME_PTHREAD... " >&6; } | printf %s "checking for gpgme-pthread >= $LIBGPGME_DEPENDENCY... " >&6; } | |||
if test -n "$DEP_GPGME_PTHREAD_CFLAGS"; then | if test -n "$DEP_GPGME_PTHREAD_CFLAGS"; then | |||
pkg_cv_DEP_GPGME_PTHREAD_CFLAGS="$DEP_GPGME_PTHREAD_CFLAGS" | pkg_cv_DEP_GPGME_PTHREAD_CFLAGS="$DEP_GPGME_PTHREAD_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gpgme-pthread >= \$LIBGPGME_DEPENDENCY\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gpgme-pthread >= \$LIBGPGME_DEPENDENCY\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "gpgme-pthread >= $LIBGPGME_DEPENDENCY") 2>&5 | ($PKG_CONFIG --exists --print-errors "gpgme-pthread >= $LIBGPGME_DEPENDENCY") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 17900 | skipping to change at line 18027 | |||
pkg_cv_DEP_GPGME_PTHREAD_LIBS=`$PKG_CONFIG --libs "gpgme-pthread >= $LIBGPGME_ DEPENDENCY" 2>/dev/null` | pkg_cv_DEP_GPGME_PTHREAD_LIBS=`$PKG_CONFIG --libs "gpgme-pthread >= $LIBGPGME_ DEPENDENCY" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print- errors --cflags --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print -errors --cflags --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | |||
else | else | |||
DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflag s --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$DEP_GPGME_PTHREAD_PKG_ERRORS" >&5 | echo "$DEP_GPGME_PTHREAD_PKG_ERRORS" >&5 | |||
tmp=$LIBGPGME_DEPENDENCY | tmp=$LIBGPGME_DEPENDENCY | |||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | |||
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | |||
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | |||
else | else | |||
req_gpgme_api=0 | req_gpgme_api=0 | |||
min_gpgme_version="$tmp" | min_gpgme_version="$tmp" | |||
fi | fi | |||
skipping to change at line 18008 | skipping to change at line 18135 | |||
else | else | |||
GPGME_PTHREAD_CFLAGS="" | GPGME_PTHREAD_CFLAGS="" | |||
GPGME_PTHREAD_LIBS="" | GPGME_PTHREAD_LIBS="" | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_gpgme=no | have_gpgme=no | |||
fi | fi | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
tmp=$LIBGPGME_DEPENDENCY | tmp=$LIBGPGME_DEPENDENCY | |||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | |||
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | |||
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | |||
else | else | |||
req_gpgme_api=0 | req_gpgme_api=0 | |||
min_gpgme_version="$tmp" | min_gpgme_version="$tmp" | |||
fi | fi | |||
skipping to change at line 18103 | skipping to change at line 18230 | |||
else | else | |||
GPGME_PTHREAD_CFLAGS="" | GPGME_PTHREAD_CFLAGS="" | |||
GPGME_PTHREAD_LIBS="" | GPGME_PTHREAD_LIBS="" | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_gpgme=no | have_gpgme=no | |||
fi | fi | |||
else | else | |||
DEP_GPGME_PTHREAD_CFLAGS=$pkg_cv_DEP_GPGME_PTHREAD_CFLAGS | DEP_GPGME_PTHREAD_CFLAGS=$pkg_cv_DEP_GPGME_PTHREAD_CFLAGS | |||
DEP_GPGME_PTHREAD_LIBS=$pkg_cv_DEP_GPGME_PTHREAD_LIBS | DEP_GPGME_PTHREAD_LIBS=$pkg_cv_DEP_GPGME_PTHREAD_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_gpgme=yes | have_gpgme=yes | |||
fi | fi | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DEP_GPGME_PTHREAD" >& | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpgme-pthread >= $LIB | |||
5 | GPGME_DEPENDENCY" >&5 | |||
printf %s "checking for DEP_GPGME_PTHREAD... " >&6; } | printf %s "checking for gpgme-pthread >= $LIBGPGME_DEPENDENCY... " >&6; } | |||
if test -n "$DEP_GPGME_PTHREAD_CFLAGS"; then | if test -n "$DEP_GPGME_PTHREAD_CFLAGS"; then | |||
pkg_cv_DEP_GPGME_PTHREAD_CFLAGS="$DEP_GPGME_PTHREAD_CFLAGS" | pkg_cv_DEP_GPGME_PTHREAD_CFLAGS="$DEP_GPGME_PTHREAD_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gpgme-pthread >= \$LIBGPGME_DEPENDENCY\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gpgme-pthread >= \$LIBGPGME_DEPENDENCY\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "gpgme-pthread >= $LIBGPGME_DEPENDENCY") 2>&5 | ($PKG_CONFIG --exists --print-errors "gpgme-pthread >= $LIBGPGME_DEPENDENCY") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 18156 | skipping to change at line 18283 | |||
pkg_cv_DEP_GPGME_PTHREAD_LIBS=`$PKG_CONFIG --libs "gpgme-pthread >= $LIBGPGME_ DEPENDENCY" 2>/dev/null` | pkg_cv_DEP_GPGME_PTHREAD_LIBS=`$PKG_CONFIG --libs "gpgme-pthread >= $LIBGPGME_ DEPENDENCY" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print- errors --cflags --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print -errors --cflags --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | |||
else | else | |||
DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | DEP_GPGME_PTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflag s --libs "gpgme-pthread >= $LIBGPGME_DEPENDENCY" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$DEP_GPGME_PTHREAD_PKG_ERRORS" >&5 | echo "$DEP_GPGME_PTHREAD_PKG_ERRORS" >&5 | |||
tmp=$LIBGPGME_DEPENDENCY | tmp=$LIBGPGME_DEPENDENCY | |||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | |||
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | |||
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | |||
else | else | |||
req_gpgme_api=0 | req_gpgme_api=0 | |||
min_gpgme_version="$tmp" | min_gpgme_version="$tmp" | |||
fi | fi | |||
skipping to change at line 18264 | skipping to change at line 18391 | |||
else | else | |||
GPGME_PTHREAD_CFLAGS="" | GPGME_PTHREAD_CFLAGS="" | |||
GPGME_PTHREAD_LIBS="" | GPGME_PTHREAD_LIBS="" | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_gpgme=no | have_gpgme=no | |||
fi | fi | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
tmp=$LIBGPGME_DEPENDENCY | tmp=$LIBGPGME_DEPENDENCY | |||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | |||
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | |||
min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` | |||
else | else | |||
req_gpgme_api=0 | req_gpgme_api=0 | |||
min_gpgme_version="$tmp" | min_gpgme_version="$tmp" | |||
fi | fi | |||
skipping to change at line 18359 | skipping to change at line 18486 | |||
else | else | |||
GPGME_PTHREAD_CFLAGS="" | GPGME_PTHREAD_CFLAGS="" | |||
GPGME_PTHREAD_LIBS="" | GPGME_PTHREAD_LIBS="" | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
have_gpgme=no | have_gpgme=no | |||
fi | fi | |||
else | else | |||
DEP_GPGME_PTHREAD_CFLAGS=$pkg_cv_DEP_GPGME_PTHREAD_CFLAGS | DEP_GPGME_PTHREAD_CFLAGS=$pkg_cv_DEP_GPGME_PTHREAD_CFLAGS | |||
DEP_GPGME_PTHREAD_LIBS=$pkg_cv_DEP_GPGME_PTHREAD_LIBS | DEP_GPGME_PTHREAD_LIBS=$pkg_cv_DEP_GPGME_PTHREAD_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_gpgme=yes | have_gpgme=yes | |||
fi | fi | |||
else | else | |||
DEP_GPGME_CFLAGS=$pkg_cv_DEP_GPGME_CFLAGS | DEP_GPGME_CFLAGS=$pkg_cv_DEP_GPGME_CFLAGS | |||
DEP_GPGME_LIBS=$pkg_cv_DEP_GPGME_LIBS | DEP_GPGME_LIBS=$pkg_cv_DEP_GPGME_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
have_gpgme=yes | have_gpgme=yes | |||
fi | fi | |||
if test x$have_gpgme = xno | if test x$have_gpgme = xno | |||
then : | then : | |||
as_fn_error $? "Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later" "$L INENO" 5 | as_fn_error $? "Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later" "$L INENO" 5 | |||
fi | fi | |||
# Check whether --enable-selinux-module was given. | # Check whether --enable-selinux-module was given. | |||
if test ${enable_selinux_module+y} | if test ${enable_selinux_module+y} | |||
skipping to change at line 18459 | skipping to change at line 18586 | |||
if test ${enable_system_helper+y} | if test ${enable_system_helper+y} | |||
then : | then : | |||
enableval=$enable_system_helper; | enableval=$enable_system_helper; | |||
else $as_nop | else $as_nop | |||
enable_system_helper=yes | enable_system_helper=yes | |||
fi | fi | |||
if test "x$enable_system_helper" = "xyes"; then | if test "x$enable_system_helper" = "xyes"; then | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for \ | |||
printf %s "checking for POLKIT... " >&6; } | polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" >&5 | |||
printf %s "checking for \ | ||||
polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED... " >&6; } | ||||
if test -n "$POLKIT_CFLAGS"; then | if test -n "$POLKIT_CFLAGS"; then | |||
pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" | pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"\\ | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"\\ | |||
polkit-agent-1 >= \$POLKIT_GOBJECT_REQUIRED\""; } >&5 | polkit-agent-1 >= \$POLKIT_GOBJECT_REQUIRED\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "\ | ($PKG_CONFIG --exists --print-errors "\ | |||
polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED") 2>&5 | polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
skipping to change at line 18504 | skipping to change at line 18633 | |||
polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" 2>/dev/null` | polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cf lags --libs "\ | POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --c flags --libs "\ | |||
polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" 2>&1` | polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" 2>&1` | |||
else | else | |||
POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "\ | POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "\ | |||
polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" 2>&1` | polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$POLKIT_PKG_ERRORS" >&5 | echo "$POLKIT_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (\ | as_fn_error $? "Package requirements (\ | |||
polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED) were not met: | polkit-agent-1 >= $POLKIT_GOBJECT_REQUIRED) were not met: | |||
$POLKIT_PKG_ERRORS | $POLKIT_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables POLKIT_CFLAGS | Alternatively, you may set the environment variables POLKIT_CFLAGS | |||
and POLKIT_LIBS to avoid the need to call pkg-config. | and POLKIT_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables POLKIT_CFLAGS | Alternatively, you may set the environment variables POLKIT_CFLAGS | |||
and POLKIT_LIBS to avoid the need to call pkg-config. | and POLKIT_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS | POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS | |||
POLKIT_LIBS=$pkg_cv_POLKIT_LIBS | POLKIT_LIBS=$pkg_cv_POLKIT_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
printf "%s\n" "#define USE_SYSTEM_HELPER 1" >>confdefs.h | printf "%s\n" "#define USE_SYSTEM_HELPER 1" >>confdefs.h | |||
fi | fi | |||
if test x$enable_system_helper = xyes; then | if test x$enable_system_helper = xyes; then | |||
BUILD_SYSTEM_HELPER_TRUE= | BUILD_SYSTEM_HELPER_TRUE= | |||
skipping to change at line 18584 | skipping to change at line 18713 | |||
if test x$enable_auto_sideloading = xyes; then | if test x$enable_auto_sideloading = xyes; then | |||
BUILD_AUTO_SIDELOADING_TRUE= | BUILD_AUTO_SIDELOADING_TRUE= | |||
BUILD_AUTO_SIDELOADING_FALSE='#' | BUILD_AUTO_SIDELOADING_FALSE='#' | |||
else | else | |||
BUILD_AUTO_SIDELOADING_TRUE='#' | BUILD_AUTO_SIDELOADING_TRUE='#' | |||
BUILD_AUTO_SIDELOADING_FALSE= | BUILD_AUTO_SIDELOADING_FALSE= | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUSE3" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fuse3 >= 3.1.1" >&5 | |||
printf %s "checking for FUSE3... " >&6; } | printf %s "checking for fuse3 >= 3.1.1... " >&6; } | |||
if test -n "$FUSE3_CFLAGS"; then | if test -n "$FUSE3_CFLAGS"; then | |||
pkg_cv_FUSE3_CFLAGS="$FUSE3_CFLAGS" | pkg_cv_FUSE3_CFLAGS="$FUSE3_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"fuse3 >= 3.1.1\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"fuse3 >= 3.1.1\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "fuse3 >= 3.1.1") 2>&5 | ($PKG_CONFIG --exists --print-errors "fuse3 >= 3.1.1") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 18623 | skipping to change at line 18752 | |||
pkg_cv_FUSE3_LIBS=`$PKG_CONFIG --libs "fuse3 >= 3.1.1" 2>/dev/null` | pkg_cv_FUSE3_LIBS=`$PKG_CONFIG --libs "fuse3 >= 3.1.1" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
FUSE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "fuse3 >= 3.1.1" 2>&1` | FUSE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cf lags --libs "fuse3 >= 3.1.1" 2>&1` | |||
else | else | |||
FUSE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fus e3 >= 3.1.1" 2>&1` | FUSE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fu se3 >= 3.1.1" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$FUSE3_PKG_ERRORS" >&5 | echo "$FUSE3_PKG_ERRORS" >&5 | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUSE" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fuse >= 2.9.2" >&5 | |||
printf %s "checking for FUSE... " >&6; } | printf %s "checking for fuse >= 2.9.2... " >&6; } | |||
if test -n "$FUSE_CFLAGS"; then | if test -n "$FUSE_CFLAGS"; then | |||
pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS" | pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"fuse >= 2.9.2\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"fuse >= 2.9.2\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "fuse >= 2.9.2") 2>&5 | ($PKG_CONFIG --exists --print-errors "fuse >= 2.9.2") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 18679 | skipping to change at line 18808 | |||
pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse >= 2.9.2" 2>/dev/null` | pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse >= 2.9.2" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "fuse >= 2.9.2" 2>&1` | FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "fuse >= 2.9.2" 2>&1` | |||
else | else | |||
FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fuse >= 2.9.2" 2>&1` | FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fus e >= 2.9.2" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$FUSE_PKG_ERRORS" >&5 | echo "$FUSE_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (fuse >= 2.9.2) were not met: | as_fn_error $? "Package requirements (fuse >= 2.9.2) were not met: | |||
$FUSE_PKG_ERRORS | $FUSE_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables FUSE_CFLAGS | Alternatively, you may set the environment variables FUSE_CFLAGS | |||
and FUSE_LIBS to avoid the need to call pkg-config. | and FUSE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables FUSE_CFLAGS | Alternatively, you may set the environment variables FUSE_CFLAGS | |||
and FUSE_LIBS to avoid the need to call pkg-config. | and FUSE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS | FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS | |||
FUSE_LIBS=$pkg_cv_FUSE_LIBS | FUSE_LIBS=$pkg_cv_FUSE_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
FUSE_USE_VERSION=26 | FUSE_USE_VERSION=26 | |||
fi | fi | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FUSE" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fuse >= 2.9.2" >&5 | |||
printf %s "checking for FUSE... " >&6; } | printf %s "checking for fuse >= 2.9.2... " >&6; } | |||
if test -n "$FUSE_CFLAGS"; then | if test -n "$FUSE_CFLAGS"; then | |||
pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS" | pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"fuse >= 2.9.2\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"fuse >= 2.9.2\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "fuse >= 2.9.2") 2>&5 | ($PKG_CONFIG --exists --print-errors "fuse >= 2.9.2") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 18771 | skipping to change at line 18900 | |||
pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse >= 2.9.2" 2>/dev/null` | pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse >= 2.9.2" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "fuse >= 2.9.2" 2>&1` | FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "fuse >= 2.9.2" 2>&1` | |||
else | else | |||
FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fuse >= 2.9.2" 2>&1` | FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fus e >= 2.9.2" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$FUSE_PKG_ERRORS" >&5 | echo "$FUSE_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (fuse >= 2.9.2) were not met: | as_fn_error $? "Package requirements (fuse >= 2.9.2) were not met: | |||
$FUSE_PKG_ERRORS | $FUSE_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables FUSE_CFLAGS | Alternatively, you may set the environment variables FUSE_CFLAGS | |||
and FUSE_LIBS to avoid the need to call pkg-config. | and FUSE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables FUSE_CFLAGS | Alternatively, you may set the environment variables FUSE_CFLAGS | |||
and FUSE_LIBS to avoid the need to call pkg-config. | and FUSE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS | FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS | |||
FUSE_LIBS=$pkg_cv_FUSE_LIBS | FUSE_LIBS=$pkg_cv_FUSE_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
FUSE_USE_VERSION=26 | FUSE_USE_VERSION=26 | |||
fi | fi | |||
else | else | |||
FUSE3_CFLAGS=$pkg_cv_FUSE3_CFLAGS | FUSE3_CFLAGS=$pkg_cv_FUSE3_CFLAGS | |||
FUSE3_LIBS=$pkg_cv_FUSE3_LIBS | FUSE3_LIBS=$pkg_cv_FUSE3_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
FUSE_USE_VERSION=31 | FUSE_USE_VERSION=31 | |||
FUSE_CFLAGS="$FUSE3_CFLAGS" | FUSE_CFLAGS="$FUSE3_CFLAGS" | |||
FUSE_LIBS="$FUSE3_LIBS" | FUSE_LIBS="$FUSE3_LIBS" | |||
fi | fi | |||
printf "%s\n" "#define FUSE_USE_VERSION $FUSE_USE_VERSION" >>confdefs.h | printf "%s\n" "#define FUSE_USE_VERSION $FUSE_USE_VERSION" >>confdefs.h | |||
skipping to change at line 18844 | skipping to change at line 18973 | |||
if test ${enable_xauth+y} | if test ${enable_xauth+y} | |||
then : | then : | |||
enableval=$enable_xauth; | enableval=$enable_xauth; | |||
else $as_nop | else $as_nop | |||
enable_xauth=yes | enable_xauth=yes | |||
fi | fi | |||
if test "x$enable_xauth" = "xyes"; then | if test "x$enable_xauth" = "xyes"; then | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XAUTH" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xau" >&5 | |||
printf %s "checking for XAUTH... " >&6; } | printf %s "checking for xau... " >&6; } | |||
if test -n "$XAUTH_CFLAGS"; then | if test -n "$XAUTH_CFLAGS"; then | |||
pkg_cv_XAUTH_CFLAGS="$XAUTH_CFLAGS" | pkg_cv_XAUTH_CFLAGS="$XAUTH_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"xau\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"xau\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "xau") 2>&5 | ($PKG_CONFIG --exists --print-errors "xau") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 18883 | skipping to change at line 19012 | |||
pkg_cv_XAUTH_LIBS=`$PKG_CONFIG --libs "xau" 2>/dev/null` | pkg_cv_XAUTH_LIBS=`$PKG_CONFIG --libs "xau" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
XAUTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "xau" 2>&1` | XAUTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cf lags --libs "xau" 2>&1` | |||
else | else | |||
XAUTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xau " 2>&1` | XAUTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xa u" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$XAUTH_PKG_ERRORS" >&5 | echo "$XAUTH_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (xau) were not met: | as_fn_error $? "Package requirements (xau) were not met: | |||
$XAUTH_PKG_ERRORS | $XAUTH_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables XAUTH_CFLAGS | Alternatively, you may set the environment variables XAUTH_CFLAGS | |||
and XAUTH_LIBS to avoid the need to call pkg-config. | and XAUTH_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables XAUTH_CFLAGS | Alternatively, you may set the environment variables XAUTH_CFLAGS | |||
and XAUTH_LIBS to avoid the need to call pkg-config. | and XAUTH_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
XAUTH_CFLAGS=$pkg_cv_XAUTH_CFLAGS | XAUTH_CFLAGS=$pkg_cv_XAUTH_CFLAGS | |||
XAUTH_LIBS=$pkg_cv_XAUTH_LIBS | XAUTH_LIBS=$pkg_cv_XAUTH_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
printf "%s\n" "#define ENABLE_XAUTH 1" >>confdefs.h | printf "%s\n" "#define ENABLE_XAUTH 1" >>confdefs.h | |||
fi | fi | |||
# Check whether --enable-gdm-env-file was given. | # Check whether --enable-gdm-env-file was given. | |||
skipping to change at line 18967 | skipping to change at line 19096 | |||
enable_sandboxed_triggers=yes | enable_sandboxed_triggers=yes | |||
fi | fi | |||
if test "x$enable_sandboxed_triggers" = "xno"; then | if test "x$enable_sandboxed_triggers" = "xno"; then | |||
printf "%s\n" "#define DISABLE_SANDBOXED_TRIGGERS 1" >>confdefs.h | printf "%s\n" "#define DISABLE_SANDBOXED_TRIGGERS 1" >>confdefs.h | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OSTREE" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ostree-1 >= $OSTREE_R | |||
printf %s "checking for OSTREE... " >&6; } | EQS" >&5 | |||
printf %s "checking for ostree-1 >= $OSTREE_REQS... " >&6; } | ||||
if test -n "$OSTREE_CFLAGS"; then | if test -n "$OSTREE_CFLAGS"; then | |||
pkg_cv_OSTREE_CFLAGS="$OSTREE_CFLAGS" | pkg_cv_OSTREE_CFLAGS="$OSTREE_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"ostree-1 >= \$OSTREE_REQS\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"ostree-1 >= \$OSTREE_REQS\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "ostree-1 >= $OSTREE_REQS") 2>&5 | ($PKG_CONFIG --exists --print-errors "ostree-1 >= $OSTREE_REQS") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 19006 | skipping to change at line 19135 | |||
pkg_cv_OSTREE_LIBS=`$PKG_CONFIG --libs "ostree-1 >= $OSTREE_REQS" 2>/dev/null` | pkg_cv_OSTREE_LIBS=`$PKG_CONFIG --libs "ostree-1 >= $OSTREE_REQS" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
OSTREE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cf lags --libs "ostree-1 >= $OSTREE_REQS" 2>&1` | OSTREE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --c flags --libs "ostree-1 >= $OSTREE_REQS" 2>&1` | |||
else | else | |||
OSTREE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "os tree-1 >= $OSTREE_REQS" 2>&1` | OSTREE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "o stree-1 >= $OSTREE_REQS" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$OSTREE_PKG_ERRORS" >&5 | echo "$OSTREE_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (ostree-1 >= $OSTREE_REQS) were not met: | as_fn_error $? "Package requirements (ostree-1 >= $OSTREE_REQS) were not met: | |||
$OSTREE_PKG_ERRORS | $OSTREE_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables OSTREE_CFLAGS | Alternatively, you may set the environment variables OSTREE_CFLAGS | |||
and OSTREE_LIBS to avoid the need to call pkg-config. | and OSTREE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables OSTREE_CFLAGS | Alternatively, you may set the environment variables OSTREE_CFLAGS | |||
and OSTREE_LIBS to avoid the need to call pkg-config. | and OSTREE_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
OSTREE_CFLAGS=$pkg_cv_OSTREE_CFLAGS | OSTREE_CFLAGS=$pkg_cv_OSTREE_CFLAGS | |||
OSTREE_LIBS=$pkg_cv_OSTREE_LIBS | OSTREE_LIBS=$pkg_cv_OSTREE_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JSON" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for json-glib-1.0" >&5 | |||
printf %s "checking for JSON... " >&6; } | printf %s "checking for json-glib-1.0... " >&6; } | |||
if test -n "$JSON_CFLAGS"; then | if test -n "$JSON_CFLAGS"; then | |||
pkg_cv_JSON_CFLAGS="$JSON_CFLAGS" | pkg_cv_JSON_CFLAGS="$JSON_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"json-glib-1.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"json-glib-1.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "json-glib-1.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "json-glib-1.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 19095 | skipping to change at line 19224 | |||
pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json-glib-1.0" 2>/dev/null` | pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json-glib-1.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfla gs --libs "json-glib-1.0" 2>&1` | JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cfl ags --libs "json-glib-1.0" 2>&1` | |||
else | else | |||
JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json -glib-1.0" 2>&1` | JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jso n-glib-1.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$JSON_PKG_ERRORS" >&5 | echo "$JSON_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (json-glib-1.0) were not met: | as_fn_error $? "Package requirements (json-glib-1.0) were not met: | |||
$JSON_PKG_ERRORS | $JSON_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables JSON_CFLAGS | Alternatively, you may set the environment variables JSON_CFLAGS | |||
and JSON_LIBS to avoid the need to call pkg-config. | and JSON_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables JSON_CFLAGS | Alternatively, you may set the environment variables JSON_CFLAGS | |||
and JSON_LIBS to avoid the need to call pkg-config. | and JSON_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
JSON_CFLAGS=$pkg_cv_JSON_CFLAGS | JSON_CFLAGS=$pkg_cv_JSON_CFLAGS | |||
JSON_LIBS=$pkg_cv_JSON_LIBS | JSON_LIBS=$pkg_cv_JSON_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for APPSTREAM" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for appstream >= 0.12.0" | |||
printf %s "checking for APPSTREAM... " >&6; } | >&5 | |||
printf %s "checking for appstream >= 0.12.0... " >&6; } | ||||
if test -n "$APPSTREAM_CFLAGS"; then | if test -n "$APPSTREAM_CFLAGS"; then | |||
pkg_cv_APPSTREAM_CFLAGS="$APPSTREAM_CFLAGS" | pkg_cv_APPSTREAM_CFLAGS="$APPSTREAM_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"appstream >= 0.12.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"appstream >= 0.12.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "appstream >= 0.12.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "appstream >= 0.12.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 19184 | skipping to change at line 19313 | |||
pkg_cv_APPSTREAM_LIBS=`$PKG_CONFIG --libs "appstream >= 0.12.0" 2>/dev/null` | pkg_cv_APPSTREAM_LIBS=`$PKG_CONFIG --libs "appstream >= 0.12.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
APPSTREAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors - -cflags --libs "appstream >= 0.12.0" 2>&1` | APPSTREAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appstream >= 0.12.0" 2>&1` | |||
else | else | |||
APPSTREAM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appstream >= 0.12.0" 2>&1` | APPSTREAM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appstream >= 0.12.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$APPSTREAM_PKG_ERRORS" >&5 | echo "$APPSTREAM_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (appstream >= 0.12.0) were not met: | as_fn_error $? "Package requirements (appstream >= 0.12.0) were not met: | |||
$APPSTREAM_PKG_ERRORS | $APPSTREAM_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables APPSTREAM_CFLAGS | Alternatively, you may set the environment variables APPSTREAM_CFLAGS | |||
and APPSTREAM_LIBS to avoid the need to call pkg-config. | and APPSTREAM_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables APPSTREAM_CFLAGS | Alternatively, you may set the environment variables APPSTREAM_CFLAGS | |||
and APPSTREAM_LIBS to avoid the need to call pkg-config. | and APPSTREAM_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
APPSTREAM_CFLAGS=$pkg_cv_APPSTREAM_CFLAGS | APPSTREAM_CFLAGS=$pkg_cv_APPSTREAM_CFLAGS | |||
APPSTREAM_LIBS=$pkg_cv_APPSTREAM_LIBS | APPSTREAM_LIBS=$pkg_cv_APPSTREAM_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for APPSTREAM_0_14_0" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for appstream >= 0.14.0" | |||
printf %s "checking for APPSTREAM_0_14_0... " >&6; } | >&5 | |||
printf %s "checking for appstream >= 0.14.0... " >&6; } | ||||
if test -n "$APPSTREAM_0_14_0_CFLAGS"; then | if test -n "$APPSTREAM_0_14_0_CFLAGS"; then | |||
pkg_cv_APPSTREAM_0_14_0_CFLAGS="$APPSTREAM_0_14_0_CFLAGS" | pkg_cv_APPSTREAM_0_14_0_CFLAGS="$APPSTREAM_0_14_0_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"appstream >= 0.14.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"appstream >= 0.14.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "appstream >= 0.14.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "appstream >= 0.14.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 19273 | skipping to change at line 19402 | |||
pkg_cv_APPSTREAM_0_14_0_LIBS=`$PKG_CONFIG --libs "appstream >= 0.14.0" 2>/dev/ null` | pkg_cv_APPSTREAM_0_14_0_LIBS=`$PKG_CONFIG --libs "appstream >= 0.14.0" 2>/dev/ null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
APPSTREAM_0_14_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-e rrors --cflags --libs "appstream >= 0.14.0" 2>&1` | APPSTREAM_0_14_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print- errors --cflags --libs "appstream >= 0.14.0" 2>&1` | |||
else | else | |||
APPSTREAM_0_14_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appstream >= 0.14.0" 2>&1` | APPSTREAM_0_14_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appstream >= 0.14.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$APPSTREAM_0_14_0_PKG_ERRORS" >&5 | echo "$APPSTREAM_0_14_0_PKG_ERRORS" >&5 | |||
true | true | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
true | true | |||
else | else | |||
APPSTREAM_0_14_0_CFLAGS=$pkg_cv_APPSTREAM_0_14_0_CFLAGS | APPSTREAM_0_14_0_CFLAGS=$pkg_cv_APPSTREAM_0_14_0_CFLAGS | |||
APPSTREAM_0_14_0_LIBS=$pkg_cv_APPSTREAM_0_14_0_LIBS | APPSTREAM_0_14_0_LIBS=$pkg_cv_APPSTREAM_0_14_0_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
printf "%s\n" "#define HAVE_APPSTREAM_0_14_0 1" >>confdefs.h | printf "%s\n" "#define HAVE_APPSTREAM_0_14_0 1" >>confdefs.h | |||
fi | fi | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GDK_PIXBUF" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf-2.0" >&5 | |||
printf %s "checking for GDK_PIXBUF... " >&6; } | printf %s "checking for gdk-pixbuf-2.0... " >&6; } | |||
if test -n "$GDK_PIXBUF_CFLAGS"; then | if test -n "$GDK_PIXBUF_CFLAGS"; then | |||
pkg_cv_GDK_PIXBUF_CFLAGS="$GDK_PIXBUF_CFLAGS" | pkg_cv_GDK_PIXBUF_CFLAGS="$GDK_PIXBUF_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gdk-pixbuf-2.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"gdk-pixbuf-2.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5 | ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 19344 | skipping to change at line 19473 | |||
pkg_cv_GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0" 2>/dev/null` | pkg_cv_GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-pixbuf-2.0" 2>&1` | GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-pixbuf-2.0" 2>&1` | |||
else | else | |||
GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-pixbuf-2.0" 2>&1` | GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --lib s "gdk-pixbuf-2.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$GDK_PIXBUF_PKG_ERRORS" >&5 | echo "$GDK_PIXBUF_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (gdk-pixbuf-2.0) were not met: | as_fn_error $? "Package requirements (gdk-pixbuf-2.0) were not met: | |||
$GDK_PIXBUF_PKG_ERRORS | $GDK_PIXBUF_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS | Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS | |||
and GDK_PIXBUF_LIBS to avoid the need to call pkg-config. | and GDK_PIXBUF_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS | Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS | |||
and GDK_PIXBUF_LIBS to avoid the need to call pkg-config. | and GDK_PIXBUF_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS | GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS | |||
GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS | GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
# Check whether --enable-seccomp was given. | # Check whether --enable-seccomp was given. | |||
if test ${enable_seccomp+y} | if test ${enable_seccomp+y} | |||
then : | then : | |||
enableval=$enable_seccomp; | enableval=$enable_seccomp; | |||
else $as_nop | else $as_nop | |||
enable_seccomp=yes | enable_seccomp=yes | |||
fi | fi | |||
if test "x$enable_seccomp" = "xyes"; then | if test "x$enable_seccomp" = "xyes"; then | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSECCOMP" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseccomp" >&5 | |||
printf %s "checking for LIBSECCOMP... " >&6; } | printf %s "checking for libseccomp... " >&6; } | |||
if test -n "$LIBSECCOMP_CFLAGS"; then | if test -n "$LIBSECCOMP_CFLAGS"; then | |||
pkg_cv_LIBSECCOMP_CFLAGS="$LIBSECCOMP_CFLAGS" | pkg_cv_LIBSECCOMP_CFLAGS="$LIBSECCOMP_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libseccomp\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"libseccomp\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "libseccomp") 2>&5 | ($PKG_CONFIG --exists --print-errors "libseccomp") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 19443 | skipping to change at line 19572 | |||
pkg_cv_LIBSECCOMP_LIBS=`$PKG_CONFIG --libs "libseccomp" 2>/dev/null` | pkg_cv_LIBSECCOMP_LIBS=`$PKG_CONFIG --libs "libseccomp" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
LIBSECCOMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseccomp" 2>&1` | LIBSECCOMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseccomp" 2>&1` | |||
else | else | |||
LIBSECCOMP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseccomp" 2>&1` | LIBSECCOMP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --lib s "libseccomp" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$LIBSECCOMP_PKG_ERRORS" >&5 | echo "$LIBSECCOMP_PKG_ERRORS" >&5 | |||
as_fn_error $? "Package requirements (libseccomp) were not met: | as_fn_error $? "Package requirements (libseccomp) were not met: | |||
$LIBSECCOMP_PKG_ERRORS | $LIBSECCOMP_PKG_ERRORS | |||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||
installed software in a non-standard prefix. | installed software in a non-standard prefix. | |||
Alternatively, you may set the environment variables LIBSECCOMP_CFLAGS | Alternatively, you may set the environment variables LIBSECCOMP_CFLAGS | |||
and LIBSECCOMP_LIBS to avoid the need to call pkg-config. | and LIBSECCOMP_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details." "$LINENO" 5 | See the pkg-config man page for more details." "$LINENO" 5 | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >& 5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" > &5 | |||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | |||
as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | as_fn_error $? "The pkg-config script could not be found or is too old. Make su re it | |||
is in your PATH or set the PKG_CONFIG environment variable to the full | is in your PATH or set the PKG_CONFIG environment variable to the full | |||
path to pkg-config. | path to pkg-config. | |||
Alternatively, you may set the environment variables LIBSECCOMP_CFLAGS | Alternatively, you may set the environment variables LIBSECCOMP_CFLAGS | |||
and LIBSECCOMP_LIBS to avoid the need to call pkg-config. | and LIBSECCOMP_LIBS to avoid the need to call pkg-config. | |||
See the pkg-config man page for more details. | See the pkg-config man page for more details. | |||
To get pkg-config, see <http://pkg-config.freedesktop.org/>. | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | |||
See \`config.log' for more details" "$LINENO" 5; } | See \`config.log' for more details" "$LINENO" 5; } | |||
else | else | |||
LIBSECCOMP_CFLAGS=$pkg_cv_LIBSECCOMP_CFLAGS | LIBSECCOMP_CFLAGS=$pkg_cv_LIBSECCOMP_CFLAGS | |||
LIBSECCOMP_LIBS=$pkg_cv_LIBSECCOMP_LIBS | LIBSECCOMP_LIBS=$pkg_cv_LIBSECCOMP_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
printf "%s\n" "#define ENABLE_SECCOMP 1" >>confdefs.h | printf "%s\n" "#define ENABLE_SECCOMP 1" >>confdefs.h | |||
fi | fi | |||
# Check whether --with-priv-mode was given. | # Check whether --with-priv-mode was given. | |||
skipping to change at line 20135 | skipping to change at line 20264 | |||
if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then | if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then | |||
as_fn_error $? " | as_fn_error $? " | |||
You must have $gtk_doc_requires installed to build documentation for | You must have $gtk_doc_requires installed to build documentation for | |||
$PACKAGE_NAME. Please install gtk-doc or disable building the | $PACKAGE_NAME. Please install gtk-doc or disable building the | |||
documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 | documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 | |||
fi | fi | |||
if test "x$PACKAGE_NAME" != "xglib"; then | if test "x$PACKAGE_NAME" != "xglib"; then | |||
pkg_failed=no | pkg_failed=no | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.10.0 go | |||
printf %s "checking for GTKDOC_DEPS... " >&6; } | bject-2.0 >= 2.10.0" >&5 | |||
printf %s "checking for glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0... " >&6; } | ||||
if test -n "$GTKDOC_DEPS_CFLAGS"; then | if test -n "$GTKDOC_DEPS_CFLAGS"; then | |||
pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" | pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" | |||
elif test -n "$PKG_CONFIG"; then | elif test -n "$PKG_CONFIG"; then | |||
if test -n "$PKG_CONFIG" && \ | if test -n "$PKG_CONFIG" && \ | |||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 | { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --prin t-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 | |||
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10. 0") 2>&5 | ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10. 0") 2>&5 | |||
ac_status=$? | ac_status=$? | |||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |||
test $ac_status = 0; }; then | test $ac_status = 0; }; then | |||
skipping to change at line 20174 | skipping to change at line 20303 | |||
pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 > = 2.10.0" 2>/dev/null` | pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 > = 2.10.0" 2>/dev/null` | |||
test "x$?" != "x0" && pkg_failed=yes | test "x$?" != "x0" && pkg_failed=yes | |||
else | else | |||
pkg_failed=yes | pkg_failed=yes | |||
fi | fi | |||
else | else | |||
pkg_failed=untried | pkg_failed=untried | |||
fi | fi | |||
if test $pkg_failed = yes; then | if test $pkg_failed = yes; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||
_pkg_short_errors_supported=yes | _pkg_short_errors_supported=yes | |||
else | else | |||
_pkg_short_errors_supported=no | _pkg_short_errors_supported=no | |||
fi | fi | |||
if test $_pkg_short_errors_supported = yes; then | if test $_pkg_short_errors_supported = yes; then | |||
GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` | GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-error s --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` | |||
else | else | |||
GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --lib s "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` | GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --li bs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` | |||
fi | fi | |||
# Put the nasty error message in config.log where it belongs | # Put the nasty error message in config.log where it belongs | |||
echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 | echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 | |||
: | : | |||
elif test $pkg_failed = untried; then | elif test $pkg_failed = untried; then | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |||
printf "%s\n" "no" >&6; } | printf "%s\n" "no" >&6; } | |||
: | : | |||
else | else | |||
GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS | GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS | |||
GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS | GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS | |||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |||
printf "%s\n" "yes" >&6; } | printf "%s\n" "yes" >&6; } | |||
fi | fi | |||
fi | fi | |||
# Check whether --enable-gtk-doc-html was given. | # Check whether --enable-gtk-doc-html was given. | |||
if test ${enable_gtk_doc_html+y} | if test ${enable_gtk_doc_html+y} | |||
then : | then : | |||
enableval=$enable_gtk_doc_html; | enableval=$enable_gtk_doc_html; | |||
skipping to change at line 20608 | skipping to change at line 20737 | |||
if test "$ENABLE_INSTALLED_TESTS" = "1"; then | if test "$ENABLE_INSTALLED_TESTS" = "1"; then | |||
installed_test_metadir=${datadir}/installed-tests/Flatpak | installed_test_metadir=${datadir}/installed-tests/Flatpak | |||
installed_testdir=${libexecdir}/installed-tests/Flatpak | installed_testdir=${libexecdir}/installed-tests/Flatpak | |||
fi | fi | |||
FLATPAK_MAJOR_VERSION=1 | FLATPAK_MAJOR_VERSION=1 | |||
FLATPAK_MINOR_VERSION=15 | FLATPAK_MINOR_VERSION=15 | |||
FLATPAK_MICRO_VERSION=1 | FLATPAK_MICRO_VERSION=2 | |||
FLATPAK_EXTRA_VERSION= | FLATPAK_EXTRA_VERSION= | |||
FLATPAK_INTERFACE_AGE=0 | FLATPAK_INTERFACE_AGE=0 | |||
FLATPAK_VERSION=1.15.1 | FLATPAK_VERSION=1.15.2 | |||
printf "%s\n" "#define PACKAGE_MAJOR_VERSION $FLATPAK_MAJOR_VERSION" >>confdefs. h | printf "%s\n" "#define PACKAGE_MAJOR_VERSION $FLATPAK_MAJOR_VERSION" >>confdefs. h | |||
printf "%s\n" "#define PACKAGE_MINOR_VERSION $FLATPAK_MINOR_VERSION" >>confdefs. h | printf "%s\n" "#define PACKAGE_MINOR_VERSION $FLATPAK_MINOR_VERSION" >>confdefs. h | |||
printf "%s\n" "#define PACKAGE_MICRO_VERSION $FLATPAK_MICRO_VERSION" >>confdefs. h | printf "%s\n" "#define PACKAGE_MICRO_VERSION $FLATPAK_MICRO_VERSION" >>confdefs. h | |||
printf "%s\n" "#define PACKAGE_EXTRA_VERSION $FLATPAK_EXTRA_VERSION" >>confdefs. h | printf "%s\n" "#define PACKAGE_EXTRA_VERSION $FLATPAK_EXTRA_VERSION" >>confdefs. h | |||
# libtool versioning | # libtool versioning | |||
#LT_RELEASE=$FLATPAK_MAJOR_VERSION.$FLATPAK_MINOR_VERSION | #LT_RELEASE=$FLATPAK_MAJOR_VERSION.$FLATPAK_MINOR_VERSION | |||
#LT_CURRENT=`expr $FLATPAK_MICRO_VERSION - $FLATPAK_INTERFACE_AGE` | #LT_CURRENT=`expr $FLATPAK_MICRO_VERSION - $FLATPAK_INTERFACE_AGE` | |||
#LT_REVISION=$FLATPAK_INTERFACE_AGE | #LT_REVISION=$FLATPAK_INTERFACE_AGE | |||
#LT_AGE=`expr $FLATPAK_BINARY_AGE - $FLATPAK_INTERFACE_AGE` | #LT_AGE=`expr $FLATPAK_BINARY_AGE - $FLATPAK_INTERFACE_AGE` | |||
#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` | #LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` | |||
LT_VERSION_INFO="11501:0:11501" | LT_VERSION_INFO="11502:0:11502" | |||
LT_CURRENT_MINUS_AGE=0 | LT_CURRENT_MINUS_AGE=0 | |||
ac_config_files="$ac_config_files Makefile doc/Makefile doc/reference/Makefile f latpak.pc common/flatpak-version-macros.h doc/reference/version.xml doc/flatpak- docs.xml po/Makefile.in" | ac_config_files="$ac_config_files Makefile doc/Makefile doc/reference/Makefile f latpak.pc common/flatpak-version-macros.h doc/reference/version.xml doc/flatpak- docs.xml po/Makefile.in" | |||
cat >confcache <<\_ACEOF | cat >confcache <<\_ACEOF | |||
# This file is a shell script that caches the results of configure | # This file is a shell script that caches the results of configure | |||
# tests run on this system so they can be shared between configure | # tests run on this system so they can be shared between configure | |||
# scripts and configure runs, see configure's option --config-cache. | # scripts and configure runs, see configure's option --config-cache. | |||
# It is not useful on other systems. If it contains results you don't | # It is not useful on other systems. If it contains results you don't | |||
# want to keep, you may remove or edit it. | # want to keep, you may remove or edit it. | |||
skipping to change at line 21258 | skipping to change at line 21387 | |||
## Main body of $CONFIG_STATUS script. ## | ## Main body of $CONFIG_STATUS script. ## | |||
## ----------------------------------- ## | ## ----------------------------------- ## | |||
_ASEOF | _ASEOF | |||
test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 | test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 | |||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
# Save the log message, to keep $0 and so on meaningful, and to | # Save the log message, to keep $0 and so on meaningful, and to | |||
# report actual input values of CONFIG_FILES etc. instead of their | # report actual input values of CONFIG_FILES etc. instead of their | |||
# values after options handling. | # values after options handling. | |||
ac_log=" | ac_log=" | |||
This file was extended by Flatpak $as_me 1.15.1, which was | This file was extended by Flatpak $as_me 1.15.2, which was | |||
generated by GNU Autoconf 2.71. Invocation command line was | generated by GNU Autoconf 2.71. Invocation command line was | |||
CONFIG_FILES = $CONFIG_FILES | CONFIG_FILES = $CONFIG_FILES | |||
CONFIG_HEADERS = $CONFIG_HEADERS | CONFIG_HEADERS = $CONFIG_HEADERS | |||
CONFIG_LINKS = $CONFIG_LINKS | CONFIG_LINKS = $CONFIG_LINKS | |||
CONFIG_COMMANDS = $CONFIG_COMMANDS | CONFIG_COMMANDS = $CONFIG_COMMANDS | |||
$ $0 $@ | $ $0 $@ | |||
on `(hostname || uname -n) 2>/dev/null | sed 1q` | on `(hostname || uname -n) 2>/dev/null | sed 1q` | |||
" | " | |||
skipping to change at line 21326 | skipping to change at line 21455 | |||
Report bugs to <https://github.com/flatpak/flatpak/issues>. | Report bugs to <https://github.com/flatpak/flatpak/issues>. | |||
Flatpak home page: <http://flatpak.org/>." | Flatpak home page: <http://flatpak.org/>." | |||
_ACEOF | _ACEOF | |||
ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` | ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` | |||
ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ ''/g"` | ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ ''/g"` | |||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |||
ac_cs_config='$ac_cs_config_escaped' | ac_cs_config='$ac_cs_config_escaped' | |||
ac_cs_version="\\ | ac_cs_version="\\ | |||
Flatpak config.status 1.15.1 | Flatpak config.status 1.15.2 | |||
configured by $0, generated by GNU Autoconf 2.71, | configured by $0, generated by GNU Autoconf 2.71, | |||
with options \\"\$ac_cs_config\\" | with options \\"\$ac_cs_config\\" | |||
Copyright (C) 2021 Free Software Foundation, Inc. | Copyright (C) 2021 Free Software Foundation, Inc. | |||
This config.status script is free software; the Free Software Foundation | This config.status script is free software; the Free Software Foundation | |||
gives unlimited permission to copy, distribute and modify it." | gives unlimited permission to copy, distribute and modify it." | |||
ac_pwd='$ac_pwd' | ac_pwd='$ac_pwd' | |||
srcdir='$srcdir' | srcdir='$srcdir' | |||
INSTALL='$INSTALL' | INSTALL='$INSTALL' | |||
End of changes. 239 change blocks. | ||||
315 lines changed or deleted | 458 lines changed or added |