| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Upstream uses AM_PATH_PYTHON to find a python binary and ask it where to install |
| 2 | libraries. This means we either need to depend on python-native (large build |
| 3 | dependency, early in the build) or use the host python (pythondir reflects the |
| 4 | host and not the target, breaks builds). |
| 5 | |
| 6 | The third option is to just hardcode the path where the module goes, as most |
| 7 | callers of the code use pkg-config to find where it was installed anyway. |
| 8 | |
| 9 | Upstream-Status: Inappropriate |
| 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 11 | |
| 12 | diff --git a/configure.ac b/configure.ac |
| 13 | index d140bfe..c7b68da 100644 |
| 14 | --- a/configure.ac |
| 15 | +++ b/configure.ac |
| 16 | @@ -14,7 +14,10 @@ if test "$XMLLINT" = "no"; then |
| 17 | AC_MSG_WARN([xmllint not found; unable to validate against schema.]) |
| 18 | fi |
| 19 | |
| 20 | -AM_PATH_PYTHON([2.5]) |
| 21 | +pythondir="${libdir}/xcb-proto" |
| 22 | +AC_SUBST(pythondir) |
| 23 | +PYTHON="python" |
| 24 | +AC_SUBST(PYTHON) |
| 25 | |
| 26 | xcbincludedir='${datadir}/xcb' |
| 27 | AC_SUBST(xcbincludedir) |