Commit Graph

4 Commits

Author SHA1 Message Date
e3abec3f07 fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.

(regression from 4af38b099c741c3676aefeb20c515913aaeed666)

Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
2014-02-12 09:53:08 +01:00
ce40605a8f Revert "no need to double the conditional, once is enough"
This reverts commit b63029c8072c10c03b2fc36fe82619f0cff0ca18

This might be a bug in gb_Helper_optional or some such, but I get:

make[1]: *** No rule to make target `/home/master/src/libreoffice/workdirs/master/src/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz', needed by `/home/master/src/libreoffice/workdirs/master/workdir/unxlngx6/UnpackedTarget/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [build] Error 2

Change-Id: Ib9cd0cbe800f158bf50aaeb95f848cc2fd805de3
Reviewed-on: https://gerrit.libreoffice.org/6287
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-10-17 02:38:40 +00:00
b63029c807 no need to double the conditional, once is enough
- the whole module wont be loaded with --with-system-libpng because of the
  gb_Helper_optional thingie one level up

Change-Id: I885fedf82bdbb383a3caee343422dc79528838e0
Reviewed-on: https://gerrit.libreoffice.org/6266
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 16:20:48 +00:00
99f8cf1221 fdo#70393: move libpng to a subdir of external
Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 12:51:10 +00:00