python: Various fixes.

* configure.ac: Fix SWIG detection, bump required Python version.
* lang/python/Makefile.am: Portability fix.

Signed-off-by: Justus Winter <justus@gnupg.org>
This commit is contained in:
Justus Winter 2016-05-18 13:17:59 +02:00
parent f0dca0ab92
commit 2c3a5d93e7
2 changed files with 4 additions and 5 deletions

View File

@ -345,16 +345,15 @@ if test "$found" = "1"; then
AX_PKG_SWIG AX_PKG_SWIG
if test -z "$SWIG"; then if test -z "$SWIG"; then
if test "$explicit_languages" = "1"; then if test "$explicit_languages" = "1"; then
die=yes AC_MSG_ERROR([[
AC_MSG_NOTICE([[
*** ***
*** You need SWIG to build the Python bindings. *** You need SWIG to build the Python bindings.
***]]) ***]])
else else
enabled_languages=$(echo $enabled_languages | sed 's/qt//') enabled_languages=$(echo $enabled_languages | sed 's/python//')
fi fi
else else
AM_PATH_PYTHON([3.2]) AM_PATH_PYTHON([3.3])
AX_SWIG_PYTHON AX_SWIG_PYTHON
fi fi
fi fi

View File

@ -26,7 +26,7 @@ gpgme.h: ../../src/gpgme.h
# For VPATH builds we need to copy some files because Python's # For VPATH builds we need to copy some files because Python's
# distutils are not VPATH-aware. # distutils are not VPATH-aware.
copystamp: $(srcdir)/pyme $(srcdir)/helpers.c $(srcdir)/helpers.h 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 $@ touch $@
gpgme_wrap.c pyme/pygpgme.py: gpgme.i gpgme.h copystamp gpgme_wrap.c pyme/pygpgme.py: gpgme.i gpgme.h copystamp