diff options
| author | Justus Winter <[email protected]> | 2016-09-26 09:35:40 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-09-26 14:54:57 +0000 |
| commit | 3703a4723899d7563937b4b99f5bbe4dd8d3dfed (patch) | |
| tree | 247cea864252c3774c56df74cd1ee9dfc1881d22 /lang/python/setup.py.in | |
| parent | Fix spelling (diff) | |
| download | gpgme-3703a4723899d7563937b4b99f5bbe4dd8d3dfed.tar.gz gpgme-3703a4723899d7563937b4b99f5bbe4dd8d3dfed.zip | |
python: Include 'config.h'.
* lang/python/Makefile.am: Pass 'top_builddir' to 'setup.py'.
* lang/python/gpgme.i: Include 'config.h'.
* lang/python/helpers.c: Likewise.
* lang/python/helpers.h: Likewise.
* lang/python/setup.py.in: Make sure that 'config.h' can be found.
--
Fixes build on 32 bit platforms with large file support.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'lang/python/setup.py.in')
| -rwxr-xr-x | lang/python/setup.py.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in index 31892c1b..7af2d485 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in @@ -28,6 +28,7 @@ gpg_error_config = ["gpg-error-config"] gpgme_config_flags = ["--thread=pthread"] gpgme_config = ["gpgme-config"] + gpgme_config_flags gpgme_h = "" +include_dirs = [os.getcwd()] library_dirs = [] in_tree = False extra_swig_opts = [] @@ -38,8 +39,13 @@ if os.path.exists("../../src/gpgme-config"): in_tree = True gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags gpgme_h = "../../src/gpgme.h" + if 'top_builddir' in os.environ: + include_dirs.append(os.environ['top_builddir']) + # Make sure that SWIG finds config.h when processing gpgme.i. + extra_swig_opts.append("-I{0}".format(os.environ['top_builddir'])) library_dirs = ["../../src/.libs"] # XXX uses libtool internals extra_macros.update( + HAVE_CONFIG_H=1, HAVE_DATA_H=1, IN_TREE_BUILD=1, ) @@ -94,7 +100,6 @@ subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpgme_h], subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpg_error_h], stdout=open("errors.i", "w")) -include_dirs = [os.getcwd()] define_macros = [] libs = getconfig('libs') |