Commit Graph

4 Commits

Author SHA1 Message Date
Felix Bünemann 5ab0001ec6 Add configure check for zlib with inflateInit2
and replace old unused and poorly named FIND_ZIP. The new code prefers
pkgconfig and only falls back to manual detection if needed.

This also prioritizes detected zlib flags and includes to be preferred
over the ones that are added by pkgconfig for libpng, tifflib etc. which
would otherwise have caused the system default zlib to be used.
2016-06-27 03:03:45 +02:00
John Cupitt 10cfbc553f get rid of m4-safe
and don't copy the .m4 files recommended by glib-gettextize either
2016-05-18 13:41:31 +01:00
John Cupitt 91aa288a44 break up acinclude.m4
it's now in a more maintainable set of .m4 files in m4-safe
2016-05-18 10:41:05 +01:00
Felix Bünemann f0a5ac5bbc Vendor python.m4 to fix wrong multiarch exec paths
The python.m4 that ships with automake hardcodes the library path for
platfrom dependent files to `lib`, which is wrong for multiarch systems.

Instead we import the `m4/python.m4` from pygobject, which does not have
this problem and also ensures we have the same behavior as pygobject
which we are depending on for pyvips8.

Due to this change some minor changes to how the `bootstrap.sh` script
clean up the `m4` folder where needed.

The python search order has been modified to prefer the default python
over python2 over python3.
2016-05-18 04:28:58 +02:00