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

Merge pull request #1588 from kleisauke/expat-pkgconf

Browse Source 
Prefer to find expat with pkg-config
This commit is contained in:
John Cupitt 2020-03-24 17:04:22 +00:00 committed by GitHub
commit 080ecbb54e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -576,9 +576,16 @@ PKG_CHECK_MODULES(HAVE_CHECKED_MUL, glib-2.0 >= 2.48,
# check for gtk-doc # check for gtk-doc
GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
# we need expat ... we'd love to use expat.pc, but sadly this is only available # we need expat ... the .pc file for expat is only available
# for recent linuxes, so we have to use the old and horrible expat.m4 # for recent linuxes, so we fall back to AM_WITH_EXPAT
AM_WITH_EXPAT PKG_CHECK_MODULES(EXPAT, expat,
[expat_found=yes
PACKAGES_USED="$PACKAGES_USED expat"
],
[AM_WITH_EXPAT
]
)
if test x"$expat_found" = x"no"; then if test x"$expat_found" = x"no"; then
exit 1 exit 1
fi fi