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

fix vips7 py enable flag

Browse Source
This commit is contained in:
John Cupitt 2017-10-02 13:17:12 +01:00
parent 560f8ac727
commit 54e6cdd17e
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure.ac
View File

@ -965,40 +965,43 @@ if test x"$with_libexif" != "xno"; then
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
fi fi
# make python binding? # make vips7 (swig-based) py binding
with_python="no (default)" AC_ARG_ENABLE([pyvips7],
AC_ARG_WITH([python], AS_HELP_STRING([--enable-pyvips7], [build vips7 Python binding (default: no)]),
AS_HELP_STRING([--with-python], [enable_pyvips7=$enableval
[build with vips7 Python bindings (default: no)])) ],
[enable_pyvips7="no (default)"
]
)
if test x"$with_python" = x"yes"; then if test x"$enable_pyvips7" = x"yes"; then
if test x"$enable_cxx" = x"no"; 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 enable_pyvips7=no
AC_MSG_WARN([C++ is off, disabling vips7 Python binding]) AC_MSG_WARN([C++ is off, disabling vips7 Python binding])
fi fi
fi fi
if test x"$with_python" = x"yes"; then if test x"$enable_pyvips7" = x"yes"; then
JD_PATH_PYTHON(2.7,, JD_PATH_PYTHON(2.7,,
[with_python=no [enable_pyvips7=no
AC_MSG_WARN([Python >= 2.7 not found; disabling vips7 Python binding]) AC_MSG_WARN([Python >= 2.7 not found; disabling vips7 Python binding])
] ]
) )
fi fi
if test x"$with_python" = x"yes"; then if test x"$enable_pyvips7" = x"yes"; then
# The SWIG bindings don't compile on python3 (see issue #334). # The SWIG bindings don't compile on python3 (see issue #334).
AM_PYTHON_CHECK_VERSION([$PYTHON], [3.0], AM_PYTHON_CHECK_VERSION([$PYTHON], [3.0],
[with_python=no [enable_pyvips7=no
AC_MSG_WARN([Python >= 3.0 found; disabling vips7 Python binding]) AC_MSG_WARN([Python >= 3.0 found; disabling vips7 Python binding])
] ]
) )
fi fi
if test x"$with_python" = x"yes"; then if test x"$enable_pyvips7" = x"yes"; then
AM_CHECK_PYTHON_HEADERS(, AM_CHECK_PYTHON_HEADERS(,
[with_python=no [enable_pyvips7=no
AC_MSG_WARN([Python headers not found; disabling vips7 Python binding]) AC_MSG_WARN([Python headers not found; disabling vips7 Python binding])
] ]
) )
@ -1007,7 +1010,7 @@ 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
# distribution # distribution
if test x"$with_python" = x"yes"; then if test x"$enable_pyvips7" = x"yes"; then
AM_CONDITIONAL(HAVE_PYTHON, true) AM_CONDITIONAL(HAVE_PYTHON, true)
else else
AM_CONDITIONAL(HAVE_PYTHON, false) AM_CONDITIONAL(HAVE_PYTHON, false)
@ -1097,7 +1100,7 @@ enable debug: $enable_debug
build deprecated components: $enable_deprecated build deprecated components: $enable_deprecated
build docs with gtkdoc: $enable_gtk_doc build docs with gtkdoc: $enable_gtk_doc
gobject introspection: $found_introspection gobject introspection: $found_introspection
build vips7 Python binding: $with_python build vips7 Python binding: $enable_pyvips7
install vips8 Python overrides: $enable_pyvips8 install vips8 Python overrides: $enable_pyvips8
(requires pygobject-3.13.0 or later) (requires pygobject-3.13.0 or later)
build radiance support: $with_radiance build radiance support: $with_radiance