diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-02-22 15:04:38 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2016-02-22 18:07:30 -0500 |
| commit | 9f9d713a5645f6153dbcc03fc891ba8f0fcd566d (patch) | |
| tree | 1a10e57f6b68bdee612b16bd00faf3481dade83b | |
| parent | 30c5fb1a5116e517a9d2e4df9cdc1fbd0249c965 (diff) | |
| download | ostree-9f9d713a5645f6153dbcc03fc891ba8f0fcd566d.tar.gz | |
build: Use threadsafe GPGME
https://bugzilla.gnome.org/show_bug.cgi?id=761863
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index e1c942d7..1625419b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,8 +43,8 @@ OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS) OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS) # This canonicalizes the PKG_CHECK_MODULES or AM_PATH_GPGME results -OT_INTERNAL_GPGME_CFLAGS = $(OT_DEP_GPGME_CFLAGS) $(GPGME_CFLAGS) -OT_INTERNAL_GPGME_LIBS = $(OT_DEP_GPGME_LIBS) $(GPGME_LIBS) +OT_INTERNAL_GPGME_CFLAGS = $(OT_DEP_GPGME_CFLAGS) $(GPGME_PTHREAD_CFLAGS) +OT_INTERNAL_GPGME_LIBS = $(OT_DEP_GPGME_LIBS) $(GPGME_PTHREAD_LIBS) if BUILDOPT_INTROSPECTION include $(INTROSPECTION_MAKEFILE) diff --git a/configure.ac b/configure.ac index 6a34c0d4..f65b93f5 100644 --- a/configure.ac +++ b/configure.ac @@ -106,13 +106,13 @@ AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test "x$found_introspection" = xyes) LIBGPGME_DEPENDENCY="1.1.8" -PKG_CHECK_MODULES(OT_DEP_GPGME, gpgme >= $LIBGPGME_DEPENDENCY, have_gpgme=yes, [ - m4_ifdef([AM_PATH_GPGME], [ - AM_PATH_GPGME($LIBGPGME_DEPENDENCY, have_gpgme=yes, have_gpgme=no) +PKG_CHECK_MODULES(OT_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 ]) ]) AS_IF([ test x$have_gpgme = xno ], [ - AC_MSG_ERROR([Need GPGME version $LIBGPGME_DEPENDENCY or later]) + AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later]) ]) OSTREE_FEATURES="$OSTREE_FEATURES +gpgme" |