mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: fix LIBJPEG_LIBS, jpeg-turbo can also be used on Linux

Browse Source 
Change-Id: I710f8ba31b6f780e3fb1d174d9ea21f270f55264
This commit is contained in:
Michael Stahl
2016-11-03 11:48:07 +01:00
parent 8b69433394
commit 6a866f99ec
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -7769,12 +7769,20 @@ _EOS
AC_MSG_ERROR([no nasm (Netwide Assembler) found]) AC_MSG_ERROR([no nasm (Netwide Assembler) found])
fi fi
LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo" 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 else
AC_MSG_RESULT([internal, jpeg]) AC_MSG_RESULT([internal, jpeg])
BUILD_TYPE="$BUILD_TYPE JPEG" BUILD_TYPE="$BUILD_TYPE JPEG"
LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/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
fi fi
AC_SUBST(NASM) AC_SUBST(NASM)