Commit 803bf8ba authored by Tiago Peixoto's avatar Tiago Peixoto

Merge branch 'master' into 'master'

Call cairo.get_include() to find py3cairo.h

See merge request !16
parents 4695c1d0 c2b87007
Pipeline #466 failed with stage
in 549 minutes and 49 seconds
......@@ -233,11 +233,13 @@ if test "$USING_CAIRO" = "yes"; then
AC_SUBST(CAIROMM_CFLAGS)
AC_SUBST(CAIROMM_LIBS)
AX_PYTHON_MODULE(cairo)
PYCAIRO_INCLUDE=-I`${PYTHON} -c 'import cairo; print(cairo.get_include())'`
PYTHON_CPPFLAGS="${PYCAIRO_INCLUDE} ${PYTHON_CPPFLAGS}"
PYTHON_VERSION_MAJOR=$(echo $PYTHON_VERSION | cut -d'.' -f1)
if test "$PYTHON_VERSION_MAJOR" = "3"; then
[PYCAIRO_HEADER=pycairo/py3cairo.h]
[PYCAIRO_HEADER=py3cairo.h]
else
[PYCAIRO_HEADER=pycairo/pycairo.h]
[PYCAIRO_HEADER=pycairo.h]
fi
[CPPFLAGS_TEMP="${CPPFLAGS}"]
[CPPFLAGS="${CAIROMM_CPPFLAGS} ${CAIROMM_CFLAGS} ${PYTHON_CPPFLAGS} ${CPPFLAGS}"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment