diff options
| author | Gustavo J. A. M. Carneiro <gjc@src.gnome.org> | 2006-01-09 23:00:43 +0000 |
|---|---|---|
| committer | Gustavo J. A. M. Carneiro <gjc@src.gnome.org> | 2006-01-09 23:00:43 +0000 |
| commit | c5f4c9acb1eeae5e6227b03ce266d49d972784b6 (patch) | |
| tree | c9b2e0f45d6f5aaa253399db4068ddcc2b14e4e6 | |
| parent | 81608306deb5456b6d872aac8c80cb7c30e93ba6 (diff) | |
| download | pygtk-c5f4c9acb1eeae5e6227b03ce266d49d972784b6.tar.gz | |
Don't build or install gobject bindings if pygobject >= 2.9 is found
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 30 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2006-01-09 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * Makefile.am: Don't build or install gobject bindings if + pygobject >= 2.9 was found. + + * configure.in: Check for pygobject 2.9; create an AM conditional + based on it. + 2006-01-04 Cedric Gustin <cedric.gustin@gmail.com> * dsextras.py (Template.generate): Pass GLOBAL_MACROS (in diff --git a/Makefile.am b/Makefile.am index a52c342d..e76a4a56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,13 @@ if BUILD_GTK GTK_SUBDIR = gtk endif -SUBDIRS = codegen gobject . $(GTK_SUBDIR) docs examples tests +SUBDIRS = codegen + +if BUILD_GOBJECT + SUBDIRS += gobject +endif + +SUBDIRS += . $(GTK_SUBDIR) docs examples tests PLATFORM_VERSION = 2.0 @@ -28,7 +34,10 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -I$(top_srcdir)/gobject # pkg-config files pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc +pkgconfig_DATA = +if BUILD_GOBJECT +pkgconfig_DATA += pygobject-$(PLATFORM_VERSION).pc +endif if BUILD_GTK pkgconfig_DATA += pygtk-$(PLATFORM_VERSION).pc endif @@ -38,13 +47,17 @@ defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs defs_DATA = # python +if BUILD_GOBJECT pyexec_PYTHON = pygtk.py +endif pyexec_LTLIBRARIES = noinst_PYTHON = ltihooks.py # pygtk scripts +if BUILD_GOBJECT pkgpythondir = $(pyexecdir)/gtk-2.0 pkgpython_PYTHON = dsextras.py +endif # pygtk extension modules pkgpyexecdir = $(pyexecdir)/gtk-2.0 diff --git a/configure.in b/configure.in index cf14c78d..fd1a4554 100644 --- a/configure.in +++ b/configure.in @@ -97,6 +97,11 @@ if test -n "$export_dynamic"; then GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"` fi +dnl Check if we should build a private copy of pygobject +PKG_CHECK_MODULES(PYGOBJECT, pygobject >= 2.9, + build_gobject=false, build_gobject=true) +AM_CONDITIONAL(BUILD_GOBJECT, $build_gobject) + dnl atk PKG_CHECK_MODULES(ATK, atk >= atk_required_version, build_atk=true, build_atk=false) @@ -197,7 +202,7 @@ AC_OUTPUT echo echo "The following modules will be built:" echo -true && echo gobject +$build_gobject && echo gobject $build_atk && echo atk $build_pango && echo pango $build_pangocairo && echo pangocairo @@ -213,6 +218,7 @@ if test ! $build_atk || ! $build_pango || \ ! $build_pangocairo ; then echo "The following modules will NOT be built:" echo + $build_gobject || echo "gobject (newer version already installed)" $build_atk || echo atk $build_pango || echo pango $build_pangocairo || echo pangocairo |