diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-03 11:48:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-03 21:25:17 +0000 |
| commit | 7b764b3da768c9d4db0624f4d1bf4b1e239f489d (patch) | |
| tree | 260c3417fd50f143597a5228c36f5e628dda63d4 | |
| parent | 1a41a31af9fb15aac14c829b10db6dc99ba40557 (diff) | |
configure: fix LIBJPEG_LIBS, jpeg-turbo can also be used on Linux
Change-Id: I710f8ba31b6f780e3fb1d174d9ea21f270f55264
(cherry picked from commit 6a866f99ecf21f6ebdbb7f00d3c72677a1361e74)
Reviewed-on: https://gerrit.libreoffice.org/30526
Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 66a830c84075..7b96f85f6b31 100644 --- a/configure.ac +++ b/configure.ac @@ -7689,12 +7689,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) |