configure.ac (flatpak-1.15.0.tar.xz) | : | configure.ac (flatpak-1.15.1.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 18 | skipping to change at line 18 | |||
# if backwards compatibility has been broken, | # if backwards compatibility has been broken, | |||
# set FLATPAK_BINARY_AGE and FLATPAK_INTERFACE_AGE to 0. | # set FLATPAK_BINARY_AGE and FLATPAK_INTERFACE_AGE to 0. | |||
# | # | |||
# in easier to understand terms: | # in easier to understand terms: | |||
# | # | |||
# on the stable branch, interface age == micro | # on the stable branch, interface age == micro | |||
# on the unstable (ie main), interface age = 0 | # on the unstable (ie main), interface age = 0 | |||
m4_define([flatpak_major_version], [1]) | m4_define([flatpak_major_version], [1]) | |||
m4_define([flatpak_minor_version], [15]) | m4_define([flatpak_minor_version], [15]) | |||
m4_define([flatpak_micro_version], [0]) | m4_define([flatpak_micro_version], [1]) | |||
m4_define([flatpak_extra_version], []) | m4_define([flatpak_extra_version], []) | |||
m4_define([flatpak_interface_age], [0]) | m4_define([flatpak_interface_age], [0]) | |||
m4_define([flatpak_binary_age], | m4_define([flatpak_binary_age], | |||
[m4_eval(10000 * flatpak_major_version + 100 * flatpak_minor_version + flatpak_micro_version)]) | [m4_eval(10000 * flatpak_major_version + 100 * flatpak_minor_version + flatpak_micro_version)]) | |||
m4_define([flatpak_version], | m4_define([flatpak_version], | |||
[flatpak_major_version.flatpak_minor_version.flatpak_micro_version()fl atpak_extra_version]) | [flatpak_major_version.flatpak_minor_version.flatpak_micro_version()fl atpak_extra_version]) | |||
AC_INIT([Flatpak], | AC_INIT([Flatpak], | |||
[flatpak_version], | [flatpak_version], | |||
[https://github.com/flatpak/flatpak/issues], | [https://github.com/flatpak/flatpak/issues], | |||
skipping to change at line 279 | skipping to change at line 279 | |||
], [ | ], [ | |||
PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) | PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) | |||
AC_DEFINE([HAVE_SOUP], 1, [Define if we have libsoup-2.4.pc]) | AC_DEFINE([HAVE_SOUP], 1, [Define if we have libsoup-2.4.pc]) | |||
http_backend=soup | http_backend=soup | |||
]) | ]) | |||
AM_CONDITIONAL(USE_CURL, test x$with_curl != xno) | AM_CONDITIONAL(USE_CURL, test x$with_curl != xno) | |||
AM_CONDITIONAL(USE_SOUP, test x$with_curl == xno) | AM_CONDITIONAL(USE_SOUP, test x$with_curl == xno) | |||
AC_SUBST(http_backend) | AC_SUBST(http_backend) | |||
LIBGPGME_DEPENDENCY="1.1.8" | LIBGPGME_DEPENDENCY="1.1.8" | |||
PKG_CHECK_MODULES(DEP_GPGME, gpgme-pthread >= $LIBGPGME_DEPENDENCY, have_gpgme=y | PKG_CHECK_MODULES([DEP_GPGME], [gpgme >= 1.8.0], [have_gpgme=yes], [ | |||
es, [ | PKG_CHECK_MODULES([DEP_GPGME_PTHREAD], [gpgme-pthread >= $LIBGPGME_DEPENDENC | |||
m4_ifdef([AM_PATH_GPGME_PTHREAD], [ | Y], [ | |||
AM_PATH_GPGME_PTHREAD($LIBGPGME_DEPENDENCY, have_gpgme=yes, have_gpgme=no | have_gpgme=yes | |||
) | ], [ | |||
],[ have_gpgme=no ]) | m4_ifdef([AM_PATH_GPGME_PTHREAD], [ | |||
AM_PATH_GPGME_PTHREAD([$LIBGPGME_DEPENDENCY], [have_gpgme=yes], [hav | ||||
e_gpgme=no]) | ||||
], [ | ||||
have_gpgme=no | ||||
]) | ||||
]) | ||||
]) | ]) | |||
AS_IF([ test x$have_gpgme = xno ], [ | AS_IF([ test x$have_gpgme = xno ], [ | |||
AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later]) | AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later]) | |||
]) | ]) | |||
AC_ARG_ENABLE(selinux-module, | AC_ARG_ENABLE(selinux-module, | |||
[AS_HELP_STRING([--enable-selinux-module],[Enable selinux module for sys tem-helper])], | [AS_HELP_STRING([--enable-selinux-module],[Enable selinux module for sys tem-helper])], | |||
enable_selinux_module=$enableval, enable_selinux_module=auto) | enable_selinux_module=$enableval, enable_selinux_module=auto) | |||
if test x$enable_selinux_module = xauto ; then | if test x$enable_selinux_module = xauto ; then | |||
AC_CHECK_FILE([/usr/share/selinux/devel/Makefile], [enable_selinux_module=yes ], [enable_selinux_module=no]) | AC_CHECK_FILE([/usr/share/selinux/devel/Makefile], [enable_selinux_module=yes ], [enable_selinux_module=no]) | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 13 lines changed or added |