configure.ac | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 6a866f99ecf21f6ebdbb7f00d3c72677a1361e74
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 3 11:48:07 2016 +0100
configure: fix LIBJPEG_LIBS, jpeg-turbo can also be used on Linux
Change-Id: I710f8ba31b6f780e3fb1d174d9ea21f270f55264
diff --git a/configure.ac b/configure.ac
index 18f0efa..0d6329e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7769,12 +7769,20 @@ _EOS
AC_MSG_ERROR([no nasm (Netwide Assembler) found])
fi
LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
- LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
+ if test "$COM" = "MSC"; then
+
LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
+ else
+ LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
+ fi
else
AC_MSG_RESULT([internal, jpeg])
BUILD_TYPE="$BUILD_TYPE JPEG"
LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg"
- LIBJPEG_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -ljpeg"
+ if test "$COM" = "MSC"; then
+ LIBJPEG_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/libjpeg.lib"
+ else
+ LIBJPEG_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -ljpeg"
+ fi
fi
fi
AC_SUBST(NASM)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
