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

Merge branch 'master' of github.com:jcupitt/libvips

Browse Source
This commit is contained in:
John Cupitt 2015-01-13 10:06:19 +00:00
commit 6a327ffde7
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -672,27 +672,28 @@ if test x"$with_pangoft2" != "xno"; then
fi fi
# install vips8 python # install vips8 python
AC_ARG_ENABLE([pyvips8], AC_ARG_ENABLE([pyvips8],
AS_HELP_STRING([--enable-pyvips8], AS_HELP_STRING([--enable-pyvips8],
[install vips8 Python overrides (default: install)])) [install vips8 Python overrides (default: test)]),
[enable_pyvips8=$enableval],
[enable_pyvips8="auto"])
if test x"$enable_pyvips8" != "xno"; then if test "x$enable_pyvips8" = "xauto"; then
PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= 3.12.0], PKG_CHECK_EXISTS([pygobject-3.0 >= 3.12.0],
[pyoverridesdir="\$(pyexecdir)/gi/overrides" [enable_pyvips8=yes],
AC_SUBST(pyoverridesdir)
],
[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
]) ])
fi fi
if test x"$enable_pyvips8" != x"no"; then if test "x$enable_pyvips8" = "xyes"; then
AM_CONDITIONAL(ENABLE_PYVIPS8, true) PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= 3.12.0])
enable_pyvips8=yes pyoverridesdir="\$(pyexecdir)/gi/overrides"
else AC_SUBST(pyoverridesdir)
AM_CONDITIONAL(ENABLE_PYVIPS8, false)
enable_pyvips8=no
fi fi
AM_CONDITIONAL(ENABLE_PYVIPS8, test x"$enable_pyvips8" = "xyes")
# 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(
[with_zip=yes], [with_zip=yes],