diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2005-01-10 16:57:42 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2005-01-10 16:57:42 +0000 |
| commit | d8d8f32a8537e1c3a447e23269450abb2b24d323 (patch) | |
| tree | 530a9c50918a79f80cedd48359461f3684277cb5 | |
| parent | 64e07ba0b2a4acb84f61e5688d3537f4a38e09e6 (diff) | |
| download | pygobject-d8d8f32a8537e1c3a447e23269450abb2b24d323.tar.gz pygobject-d8d8f32a8537e1c3a447e23269450abb2b24d323.tar.xz pygobject-d8d8f32a8537e1c3a447e23269450abb2b24d323.zip | |
Make the build of atk, pango and gtk conditional. Fixes bug #74144.PYGTK_2_5_2
* .cvsignore:
* Makefile.am:
* configure.in:
* gtk/Makefile.am:
* pygtk-2.0.pc.in:
* setup.py:
* tests/common.py:
* tests/testhelpermodule.c: Make the build of
atk, pango and gtk conditional. Fixes bug #74144.
| -rw-r--r-- | tests/common.py | 8 | ||||
| -rw-r--r-- | tests/testhelpermodule.c | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/common.py b/tests/common.py index 9429579..64fc6f4 100644 --- a/tests/common.py +++ b/tests/common.py @@ -41,6 +41,7 @@ def importModules(buildDir, srcDir): def importModule(module, directory, name=None): global isDistCheck + origName = module if '.' in module: fromlist = '.'.join(module.split('.')[:-1]) else: @@ -49,7 +50,12 @@ def importModule(module, directory, name=None): if not name: name = module + '.la' - obj = __import__(module, {}, {}, fromlist) + try: + obj = __import__(module, {}, {}, fromlist) + except ImportError: + print 'WARNING: %s could not be imported' % origName + return + if hasattr(obj, '__file__'): location = obj.__file__ else: diff --git a/tests/testhelpermodule.c b/tests/testhelpermodule.c index 791fe54..cb9a991 100644 --- a/tests/testhelpermodule.c +++ b/tests/testhelpermodule.c @@ -1,6 +1,5 @@ #include "pygobject.h" #include <gobject/gmarshal.h> -#include <gtk/gtk.h> #include "test-thread.h" #include "test-unknown.h" |