configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit 4999a4b5376a4af26e106b303a9b334f1170ff9d Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 20 14:30:38 2013 +0100 configure: LCMS2 needs same treatment as WPD etc. Change-Id: I2b8f0dd4579c97471653de9f0aa777aa7f5306a8 diff --git a/configure.ac b/configure.ac index 97365f9..37b18cc 100644 --- a/configure.ac +++ b/configure.ac @@ -7297,13 +7297,11 @@ if test "$with_system_lcms2" = "yes"; then libo_MINGW_CHECK_DLL([LCMS2], [liblcms2]) else SYSTEM_LCMS2=NO - LCMS2_LIBS="-L${OUTDIR}/lib -llcms2" - LCMS2_CFLAGS="-I${WORKDIR}/UnpackedTarball/lcms2/include" - if test "$GCC" = "yes"; then - LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long" - fi fi -libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2]) +libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/lcms2/include"],["-L${OUTDIR}/lib -llcms2"]) +if test "$GCC" = "yes"; then + LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long" +fi AC_SUBST([MINGW_LCMS2_DLL]) dnl =================================================================== _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits