sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improvements to python configure

Browse Source
This commit is contained in:
John Cupitt 2015-02-06 14:54:52 +00:00
parent 9d11c02e35
commit 3d902d2feb
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
6/2/15 started 7.42.3 6/2/15 started 7.42.3
- bump version for back-compat ABI change - bump version for back-compat ABI change
- added vips_image_memory(), an alias for vips_image_new_memory() - added vips_image_memory(), an alias for vips_image_new_memory()
- improvements to configure for python
30/12/14 started 7.42.2 30/12/14 started 7.42.2
- C++ required output params were broken, thanks Lovell - C++ required output params were broken, thanks Lovell

37
configure.ac
View File

@ -683,16 +683,24 @@ if test "x$enable_pyvips8" = "xauto"; then
[enable_pyvips8=yes], [enable_pyvips8=yes],
[AC_MSG_WARN([pygobject-3.0 not found; disabling vips8 python support]) [AC_MSG_WARN([pygobject-3.0 not found; disabling vips8 python support])
enable_pyvips8=no enable_pyvips8=no
]) ]
)
fi fi
if test "x$enable_pyvips8" = "xyes"; then if test x"$enable_pyvips8" = x"yes"; then
AM_PATH_PYTHON(2.7,,
[enable_pyvips8=no
AC_MSG_WARN([Python not found; disabling vips8 Python binding])]
)
fi
if test x"$enable_pyvips8" = x"yes"; then
PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= 3.12.0]) PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= 3.12.0])
pyoverridesdir="\$(pyexecdir)/gi/overrides" pyoverridesdir="\$(pyexecdir)/gi/overrides"
AC_SUBST(pyoverridesdir) AC_SUBST(pyoverridesdir)
fi fi
AM_CONDITIONAL(ENABLE_PYVIPS8, test x"$enable_pyvips8" = "xyes") AM_CONDITIONAL(ENABLE_PYVIPS8, test x"$enable_pyvips8" = x"yes")
# hmm, these don't have .pc files on ubuntu 5.10, how odd # hmm, these don't have .pc files on ubuntu 5.10, how odd
FIND_ZIP( FIND_ZIP(
@ -771,24 +779,27 @@ fi
# make python binding? # make python binding?
AC_ARG_WITH([python], AC_ARG_WITH([python],
AS_HELP_STRING([--without-python], AS_HELP_STRING([--without-python],
[build without Python bindings (default: test)])) [build without vips7 Python bindings (default: test)]))
if test x"$with_python" != "xno"; then if test x"$with_python" != x"no"; then
if test x"$enable_cxx" = "xno"; then if test x"$enable_cxx" = x"no"; then
# if C++ is off, we can't do Python # if C++ is off, we can't do Python
with_python=no with_python=no
AC_MSG_WARN([C++ is off, disabling Python binding]) AC_MSG_WARN([C++ is off, disabling vips7 Python binding])
else
AM_PATH_PYTHON(2.7,,
[with_python=no
AC_MSG_WARN([Python not found; disabling Python binding])])
fi fi
fi fi
if test x"$with_python" != "xno"; then if test x"$with_python" != x"no"; then
AM_PATH_PYTHON(2.7,,
[with_python=no
AC_MSG_WARN([Python not found; disabling vips7 Python binding])]
)
fi
if test x"$with_python" != x"no"; then
AM_CHECK_PYTHON_HEADERS(, AM_CHECK_PYTHON_HEADERS(,
[with_python=no [with_python=no
AC_MSG_WARN([Python headers not found])]) AC_MSG_WARN([Python headers not found; disabling vips7 Python binding])])
fi fi
# we don't check for swig: we include the generated bindings in the # we don't check for swig: we include the generated bindings in the