diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 4b5c81b0..2ef12b8d 100644 --- a/configure.ac +++ b/configure.ac @@ -14,8 +14,8 @@ AC_PREREQ([2.63]) # on the unstable (ie main), interface age = 0 m4_define([flatpak_major_version], [1]) -m4_define([flatpak_minor_version], [13]) -m4_define([flatpak_micro_version], [2]) +m4_define([flatpak_minor_version], [15]) +m4_define([flatpak_micro_version], [1]) m4_define([flatpak_extra_version], []) m4_define([flatpak_interface_age], [0]) m4_define([flatpak_binary_age], @@ -29,7 +29,7 @@ AC_INIT([Flatpak], [flatpak], [http://flatpak.org/]) -GLIB_REQS=2.44 +GLIB_REQS=2.46 SYSTEM_BWRAP_REQS=0.5.0 SYSTEM_DBUS_PROXY_REQS=0.1.0 OSTREE_REQS=2020.8 @@ -222,7 +222,6 @@ POLKIT_GOBJECT_REQUIRED=0.98 PKG_CHECK_MODULES(ARCHIVE, [libarchive >= 2.8.0]) PKG_CHECK_MODULES(BASE, [glib-2.0 >= $GLIB_REQS gio-2.0 gio-unix-2.0]) -PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.4]) PKG_CHECK_MODULES(ZSTD, [libzstd >= 0.8.1], [have_zstd=yes], [have_zstd=no]) if test $have_zstd = yes; then @@ -259,11 +258,35 @@ LIBS=$ARCHIVE_LIBS AC_CHECK_FUNCS(archive_read_support_filter_all) LIBS=$save_LIBS +CURL_DEPENDENCY=7.29.0 +AC_ARG_WITH(curl, + AS_HELP_STRING([--with-curl], [Use libcurl @<:@default=yes@:>@]), + [], [with_curl=yes]) +AS_IF([test x$with_curl != xno ], [ + PKG_CHECK_MODULES(CURL, libcurl >= $CURL_DEPENDENCY) + with_curl=yes + http_backend=curl + AC_DEFINE([HAVE_CURL], 1, [Define if we have libcurl.pc]) +], [ + PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) + AC_DEFINE([HAVE_SOUP], 1, [Define if we have libsoup-2.4.pc]) + http_backend=soup +]) +AM_CONDITIONAL(USE_CURL, test x$with_curl != xno) +AM_CONDITIONAL(USE_SOUP, test x$with_curl == xno) +AC_SUBST(http_backend) + LIBGPGME_DEPENDENCY="1.1.8" -PKG_CHECK_MODULES(DEP_GPGME, gpgme-pthread >= $LIBGPGME_DEPENDENCY, have_gpgme=yes, [ - m4_ifdef([AM_PATH_GPGME_PTHREAD], [ - AM_PATH_GPGME_PTHREAD($LIBGPGME_DEPENDENCY, have_gpgme=yes, have_gpgme=no) - ],[ have_gpgme=no ]) +PKG_CHECK_MODULES([DEP_GPGME], [gpgme >= 1.8.0], [have_gpgme=yes], [ + PKG_CHECK_MODULES([DEP_GPGME_PTHREAD], [gpgme-pthread >= $LIBGPGME_DEPENDENCY], [ + have_gpgme=yes + ], [ + m4_ifdef([AM_PATH_GPGME_PTHREAD], [ + AM_PATH_GPGME_PTHREAD([$LIBGPGME_DEPENDENCY], [have_gpgme=yes], [have_gpgme=no]) + ], [ + have_gpgme=no + ]) + ]) ]) AS_IF([ test x$have_gpgme = xno ], [ AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later]) @@ -299,7 +322,14 @@ AC_ARG_ENABLE([auto-sideloading], [enable_auto_sideloading=no]) AM_CONDITIONAL(BUILD_AUTO_SIDELOADING, test x$enable_auto_sideloading = xyes) -PKG_CHECK_MODULES(FUSE, fuse >= 2.9.2) +PKG_CHECK_MODULES([FUSE3], [fuse3 >= 3.1.1], + [ + FUSE_USE_VERSION=31 + FUSE_CFLAGS="$FUSE3_CFLAGS" + FUSE_LIBS="$FUSE3_LIBS" + ], + [PKG_CHECK_MODULES([FUSE], [fuse >= 2.9.2], [FUSE_USE_VERSION=26])]) +AC_DEFINE_UNQUOTED([FUSE_USE_VERSION], [$FUSE_USE_VERSION], [Define to the FUSE API version]) AC_ARG_ENABLE([xauth], AC_HELP_STRING([--disable-xauth], @@ -612,4 +642,5 @@ echo " Use libsystemd: $have_libsystemd" echo " Use libmalcontent: $have_libmalcontent" echo " Use libzstd: $have_zstd" echo " Use auto sideloading: $enable_auto_sideloading" +echo " HTTP backend: $http_backend" echo "" |