diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-03 11:48:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-03 11:49:36 +0100 |
| commit | 6a866f99ecf21f6ebdbb7f00d3c72677a1361e74 (patch) | |
| tree | b82213abc9bb0cf96e4161c2d87ab5f9fbb31186 /configure.ac | |
| parent | 8b694333949b51a646c3ef3bec9e985b48b7e51a (diff) | |
configure: fix LIBJPEG_LIBS, jpeg-turbo can also be used on Linux
Change-Id: I710f8ba31b6f780e3fb1d174d9ea21f270f55264
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 18f0efabd552..0d6329ec07fd 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) |