[git] GPGME - branch, master, updated. gpgme-1.6.0-155-gbbf1912

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  bbf19124bbec9eb6298cef2914baae7ac74382fe (commit)
       via  1607aa7fe5dd686ba3bfb6de4a2b602d6a458c86 (commit)
      from  73c47535b631a55687ecc5eff1d1d9a9fd71021e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bbf19124bbec9eb6298cef2914baae7ac74382fe
Author: Justus Winter <justus at g10code.com>
Date:   Wed Jun 1 15:40:49 2016 +0200

    python: Fix test suite with GnuPG prior to 2.1.12.
    
    * lang/python/tests/Makefile.am (gpg-agent.conf): Use
    'allow-loopback-pinentry'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index b85e82e..12db3a5 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -94,4 +94,5 @@ $(top_srcdir)/tests/gpg/initial.test: check-local
 
 ./gpg-agent.conf:
 # This is required for gpg2, which does not support command fd.
-	echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry > ./gpg-agent.conf
+	echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@
+	echo allow-loopback-pinentry >>$@

commit 1607aa7fe5dd686ba3bfb6de4a2b602d6a458c86
Author: Justus Winter <justus at g10code.com>
Date:   Wed Jun 1 15:33:52 2016 +0200

    python: Make Python detection more robust.
    
    Previously, missing Python development packages made configure fail
    instead of merely disabling the bindings.
    
    * configure.ac: Check for 'PYTHON_VERSION'.
    * m4/ax_python_devel.m4: Make test non-fatal.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index 7559559..b84b04b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,16 @@ if test "$found" = "1"; then
     else
         AM_PATH_PYTHON([3.3])
         AX_SWIG_PYTHON
+	if test -z "$PYTHON_VERSION"; then
+           if test "$explicit_languages" = "1"; then
+              AC_MSG_ERROR([[
+***
+*** Please install the python development packages.
+***]])
+	    else
+                enabled_languages=$(echo $enabled_languages | sed 's/python//')
+            fi
+	fi
     fi
 fi
 
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index 59a2ff0..de992c8 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -304,13 +304,12 @@ EOD`
 	AC_MSG_RESULT([$pythonexists])
 
         if test ! "x$pythonexists" = "xyes"; then
-	   AC_MSG_FAILURE([
+	   AC_MSG_WARN([
   Could not link test program to Python. Maybe the main Python library has been
   installed in some non-standard library path. If so, pass it to configure,
   via the LDFLAGS environment variable.
   Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
   ============================================================================
-   ERROR!
    You probably have to install the development version of the Python package
    for your distribution.  The exact name of this package varies among them.
   ============================================================================

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                  | 10 ++++++++++
 lang/python/tests/Makefile.am |  3 ++-
 m4/ax_python_devel.m4         |  3 +--
 3 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org