diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2014-01-27 11:38:46 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2014-01-27 11:38:46 +0900 |
| commit | e2cd8f0870d8b15af71e839f9035dce333af3c4e (patch) | |
| tree | 52afb7f9d98d8875e1f4a752254f8d35a3beb958 | |
| parent | 8468de2f165ca7dba45b13cec09fdcde83a88204 (diff) | |
Install IBus.py in python2 gi.override.
Review URL: https://codereview.appspot.com/56510043
| -rw-r--r-- | bindings/pygobject/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am index fc232099..d257b044 100644 --- a/bindings/pygobject/Makefile.am +++ b/bindings/pygobject/Makefile.am @@ -22,6 +22,11 @@ NULL = +overrides2dir = $(py2overridesdir) +overrides2_DATA = \ + gi/overrides/IBus.py \ + $(NULL) + overridesdir = $(pyoverridesdir) overrides_PYTHON = \ gi/overrides/IBus.py \ diff --git a/configure.ac b/configure.ac index 73d99ee1..43071bc4 100644 --- a/configure.ac +++ b/configure.ac @@ -380,6 +380,7 @@ AC_ARG_WITH(python, ) AM_PATH_PYTHON([2.5]) +AC_PATH_PROG(PYTHON2, python2) PYGOBJECT_REQUIRED=3.0.0 @@ -387,10 +388,16 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], [enable_pygobject=yes], [enable_pygobject=no]) if test "x$enable_pygobject" = "xyes"; then - PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) + PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) - pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` - AC_SUBST(pyoverridesdir) + pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` + AC_SUBST(pyoverridesdir) + + py2overridesdir="$pyoverridesdir" + if test x"$PYTHON2" != x""; then + py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"` + fi + AC_SUBST(py2overridesdir) fi AM_CONDITIONAL(ENABLE_PYGOBJECT, test x"$enable_pygobject" = "xyes") |