diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2013-05-06 22:20:49 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-09 08:46:47 +0000 |
| commit | c3302a23d3539070103584816d554c871b0792b7 (patch) | |
| tree | eda6004ef0e5faaaf5bc445e49e1298b876bb336 /configure.ac | |
| parent | a10bc9322dd234549a4d061f77df038d89fb5c2a (diff) | |
fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --enable-headless
Fixes compile issues with --enable-headless if png headers are installed.
Backport of 37690fe74c4c585564c67c1ff7b8be353cf68033
Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088
Reviewed-on: https://gerrit.libreoffice.org/3802
Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b196fe9dba23..89feb7f47839 100644 --- a/configure.ac +++ b/configure.ac @@ -4353,7 +4353,7 @@ if test "$enable_headless" = "yes"; then test_tde=no test_kde=no test_kde4=no - test_unix_quickstarter=no + enable_unix_qstart_libpng=no enable_cairo_canvas=no enable_gnome_vfs=no fi @@ -9446,7 +9446,12 @@ AC_SUBST(TELEPATHY_LIBS) dnl =================================================================== -PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" ) +if test "$enable_headless" != "yes"; then + PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" ) +else + LIBPNG_LIBS='' + LIBPNG_CFLAGS='' +fi AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_CFLAGS) |