diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com> | 2011-08-15 19:11:19 +0200 |
---|---|---|
committer | Sebastian Pölsterl <sebp@k-d-w.org> | 2011-08-15 19:11:19 +0200 |
commit | 2940d0c45c592c19196d4ab0d345ab27fca0f0a0 (patch) | |
tree | b2d4f7dbc4774d20f1674c7f78c27ef4d3d379c3 | |
parent | c4cdb76adf2969e0b5a97495e5947d0595c0d629 (diff) | |
download | pygobject-2940d0c45c592c19196d4ab0d345ab27fca0f0a0.tar.gz |
Don't install codegen for Python 3
https://bugzilla.gnome.org/show_bug.cgi?id=648987
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index b9b9ed3f..75baf435 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = docs codegen glib gobject gio examples +SUBDIRS = docs glib gobject gio examples + +if ENABLE_CODEGEN +SUBDIRS += codegen +endif if ENABLE_INTROSPECTION SUBDIRS += gi diff --git a/configure.ac b/configure.ac index 1b923b42..c4b83ed7 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ AC_PROG_CC AM_PROG_CC_STDC AM_PROG_CC_C_O -# check that we have the minimum version of python necisary to build +# check that we have the minimum version of python necessary to build JD_PATH_PYTHON(python_min_ver) # check if we are building for python 3 @@ -262,6 +262,9 @@ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspecti AC_SUBST(INTROSPECTION_SCANNER) AC_SUBST(INTROSPECTION_COMPILER) +dnl Do not install codegen for Python 3. +AM_CONDITIONAL(ENABLE_CODEGEN, test $build_py3k = false) + dnl add required cflags ... if test "x$GCC" = "xyes"; then JH_ADD_CFLAG([-Wall]) @@ -281,8 +284,6 @@ AC_CONFIG_FILES( Makefile pygobject-2.0.pc pygobject-2.0-uninstalled.pc - codegen/Makefile - codegen/pygobject-codegen-2.0 docs/Makefile docs/reference/entities.docbook docs/xsl/fixxref.py @@ -295,6 +296,13 @@ AC_CONFIG_FILES( examples/Makefile tests/Makefile PKG-INFO) + +if test $build_py3k = false; then + AC_CONFIG_FILES( + codegen/Makefile + codegen/pygobject-codegen-2.0) +fi + AC_OUTPUT echo |