[PATCH 3/5] subsurface-configure.pri: add another libxml/libxslt detection stage
Thiago Macieira
thiago at macieira.org
Wed Oct 9 12:37:49 UTC 2013
On quarta-feira, 9 de outubro de 2013 21:35:50, Lubomir I. Ivanov wrote:
> From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
>
> libxml and libxslt use custom -config scripts which brake
break
> --- a/subsurface-configure.pri
> +++ b/subsurface-configure.pri
> @@ -72,7 +72,16 @@ XML2_CFLAGS = $$system(xml2-config --cflags 2>$$NUL)
> XSLT_CFLAGS = $$system(xslt-config --cflags 2>$$NUL)
> XML2_LIBS = $$system(xml2-config --libs 2>$$NUL)
> XSLT_LIBS = $$system(xslt-config --libs 2>$$NUL)
> +
> link_pkgconfig {
> + isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS) {
> + XML2_CFLAGS = $$system(pkg-config --cflags libxml2 2> $$NUL)
> + XML2_LIBS = $$system(pkg-config --libs libxml2 2> $$NUL)
> + }
> + isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS) {
> + XSLT_CFLAGS = $$system(pkg-config --cflags libxslt 2> $$NUL)
> + XSLT_LIBS = $$system(pkg-config --libs libxslt 2> $$NUL)
> + }
> isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS): \
> error("Could not find libxml2. Did you forget to install it?")
> isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS): \
+1
If Apple shipped the .pc files and pkg-config, we could skip calling the scripts
at all.
--
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
Software Architect - Intel Open Source Technology Center
PGP/GPG: 0x6EF45358; fingerprint:
E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20131009/b9a5df29/attachment.sig>
More information about the subsurface
mailing list