[git] GPGME - branch, master, updated. gpgme-1.6.0-110-g2c3a5d9

[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  2c3a5d93e78cfca22785e51c5a65184a47da4bff (commit)
      from  f0dca0ab92ed18d80e30d7d39db1596b4112794f (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 2c3a5d93e78cfca22785e51c5a65184a47da4bff
Author: Justus Winter <justus at gnupg.org>
Date:   Wed May 18 13:17:59 2016 +0200

    python: Various fixes.
    
    * configure.ac: Fix SWIG detection, bump required Python version.
    * lang/python/Makefile.am: Portability fix.
    
    Signed-off-by: Justus Winter <justus at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 36f4f94..1472132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,16 +345,15 @@ if test "$found" = "1"; then
     AX_PKG_SWIG
     if test -z "$SWIG"; then
         if test "$explicit_languages" = "1"; then
-            die=yes
-            AC_MSG_NOTICE([[
+            AC_MSG_ERROR([[
 ***
 *** You need SWIG to build the Python bindings.
 ***]])
         else
-            enabled_languages=$(echo $enabled_languages | sed 's/qt//')
+            enabled_languages=$(echo $enabled_languages | sed 's/python//')
         fi
     else
-        AM_PATH_PYTHON([3.2])
+        AM_PATH_PYTHON([3.3])
         AX_SWIG_PYTHON
     fi
 fi
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 308fcd0..86c1965 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -26,7 +26,7 @@ gpgme.h: ../../src/gpgme.h
 # For VPATH builds we need to copy some files because Python's
 # distutils are not VPATH-aware.
 copystamp: $(srcdir)/pyme $(srcdir)/helpers.c $(srcdir)/helpers.h
-	if test "$(srcdir)" != "$(builddir)" ; then cp -a $^ . ; fi
+	if test "$(srcdir)" != "$(builddir)" ; then cp -r $^ . ; fi
 	touch $@
 
 gpgme_wrap.c pyme/pygpgme.py: gpgme.i gpgme.h copystamp

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

Summary of changes:
 configure.ac            | 7 +++----
 lang/python/Makefile.am | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


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