[balsa] Build with gpgme version >= 1.8



commit 2e45d3617da8a7568e2a1856fa2480c3ab5f0167
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Dec 14 19:10:07 2016 -0500

    Build with gpgme version >= 1.8
    
        * configure.ac: use $gpgmecfg --thread=pthread --libs only for
        gpgme version < 1.8.

 ChangeLog    |    7 +++++++
 configure.ac |   12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 616ebf3..8bbed16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-14  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Build with gpgme version >= 1.8
+
+       * configure.ac: use $gpgmecfg --thread=pthread --libs only for
+       gpgme version < 1.8.
+
 2016-12-10  Pawel Salek <pawsa0 gmail com>
 
        * Makefile.am: do not include mkinstalldirs any more
diff --git a/configure.ac b/configure.ac
index b7df924..0852eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,10 +399,14 @@ if test x"$gpgmecfg" != xno ; then
                have_smime=no
        fi
        if test x"$gpgmecfg" != xno ; then
-               BALSA_LIBS="$BALSA_LIBS `$gpgmecfg --thread=pthread --libs`"
-               if test x"$?" != x0 ; then
-                       AC_MSG_ERROR([*** You enabled gpgme support, but your gpgme installation does not 
support threads.])
-               fi
+               if test \( $gpgme_ve -eq 1 \) -a \( $gpgme_ma -lt 8 \) ; then
+                       BALSA_LIBS="$BALSA_LIBS `$gpgmecfg --thread=pthread --libs`"
+                       if test x"$?" != x0 ; then
+                               AC_MSG_ERROR([*** You enabled gpgme support, but your gpgme installation does 
not support threads.])
+                       fi
+                else
+                       BALSA_LIBS="$BALSA_LIBS `$gpgmecfg --libs`"
+                fi
                AC_DEFINE(HAVE_GPGME,1,[Defined when gpgme is available.])
                BALSA_CFLAGS="$BALSA_CFLAGS `$gpgmecfg --cflags`"
                gpgmecfg=yes


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]