diff --git a/configure.ac b/configure.ac index 853b8028..30de35e8 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,11 @@ dnl bundled libdnf PKGDEP_RPMOSTREE_CFLAGS="-I $(pwd)/libdnf -I $(pwd)/libdnf-build $PKGDEP_RPMOSTREE_CFLAGS" PKGDEP_RPMOSTREE_LIBS="-L$(pwd)/libdnf-build/libdnf -ldnf $PKGDEP_RPMOSTREE_LIBS" +save_LIBS=$LIBS +LIBS=$PKGDEP_RPMOSTREE_LIBS +AC_CHECK_FUNCS(ostree_repo_verify_commit_for_remote) +LIBS=$save_LIBS + AC_PATH_PROG([XSLTPROC], [xsltproc]) GLIB_TESTS diff --git a/src/daemon/rpmostreed-deployment-utils.c b/src/daemon/rpmostreed-deployment-utils.c index 6f0edf5c..de5fa706 100644 --- a/src/daemon/rpmostreed-deployment-utils.c +++ b/src/daemon/rpmostreed-deployment-utils.c @@ -96,9 +96,11 @@ rpmostreed_deployment_gpg_results (OstreeRepo *repo, if (!gpg_verify) goto out; - - result = ostree_repo_verify_commit_ext (repo, csum, NULL, NULL, - NULL, &error); +#ifdef HAVE_OSTREE_REPO_VERIFY_COMMIT_FOR_REMOTE + result = ostree_repo_verify_commit_for_remote (repo, csum, remote, NULL, &error); +#else + result = ostree_repo_verify_commit_ext (repo, csum, NULL, NULL, NULL, &error); +#endif if (!result) goto out;